[KeyGo Backup] Fixed import issue

OffRange · OffRange · commit f6cf7ca7d553 · 2023-10-29T23:29:57.000+01:00
This addresses an issue that occurred when attempting to import a backup by clicking on a .keygo file. Previously, the application would occasionally throw a "Permission denied" error.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,20 @@
         android:supportsRtl="false"
         android:theme="@style/AppTheme"
         tools:targetApi="34">
+        <activity
+            android:name=".ui.sync.ImportActivity"
+            android:exported="true"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/octet-stream" />
+                <data android:pathPattern=".*\\.keygo" />
+                <data android:scheme="content" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.MainActivity"
             android:exported="false"
@@ -40,15 +54,6 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="application/octet-stream" />
-                <data android:pathPattern=".*\\.keygo" />
-                <data android:scheme="content" />
-            </intent-filter>
         </activity>
 
         <service
diff --git a/app/src/main/java/de/davis/passwordmanager/PasswordManagerApplication.java b/app/src/main/java/de/davis/passwordmanager/PasswordManagerApplication.java
@@ -25,6 +25,7 @@ public class PasswordManagerApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        SecureElementDatabase.createAndGet(this);
 
         DynamicColors.applyToActivitiesIfAvailable(this);
 
diff --git a/app/src/main/java/de/davis/passwordmanager/security/element/SecureElementManager.java b/app/src/main/java/de/davis/passwordmanager/security/element/SecureElementManager.java
@@ -12,25 +12,23 @@ public class SecureElementManager {
     private static SecureElementManager instance;
 
     private final DashboardAdapter adapter;
-    private final TriggerDataChanged triggerDataChanged;
+    private TriggerDataChanged triggerDataChanged;
 
-    private SecureElementManager(TriggerDataChanged triggerDataChanged) {
-        this.triggerDataChanged = triggerDataChanged;
+    private SecureElementManager() {
         adapter = new DashboardAdapter();
     }
 
-    public static SecureElementManager createNew(TriggerDataChanged triggerDataChanged){
-        instance = new SecureElementManager(triggerDataChanged);
-        return instance;
-    }
-
     public static SecureElementManager getInstance(){
         if(instance == null)
-            throw new NullPointerException("call createNew first");
+            instance = new SecureElementManager();
 
         return instance;
     }
 
+    public void setTriggerDataChanged(TriggerDataChanged triggerDataChanged) {
+        this.triggerDataChanged = triggerDataChanged;
+    }
+
     public DashboardAdapter getAdapter() {
         return adapter;
     }
diff --git a/app/src/main/java/de/davis/passwordmanager/ui/BaseMainActivity.java b/app/src/main/java/de/davis/passwordmanager/ui/BaseMainActivity.java
@@ -1,6 +1,5 @@
 package de.davis.passwordmanager.ui;
 
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -13,8 +12,6 @@
 import com.google.android.material.navigation.NavigationBarView;
 
 import de.davis.passwordmanager.R;
-import de.davis.passwordmanager.sync.DataTransfer;
-import de.davis.passwordmanager.sync.keygo.KeyGoTransfer;
 import de.davis.passwordmanager.ui.views.AddBottomSheet;
 
 public class BaseMainActivity extends AppCompatActivity {
@@ -24,12 +21,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Uri data = getIntent().getData();
-        if(data != null){
-            KeyGoTransfer transfer = new KeyGoTransfer(this);
-            transfer.start(DataTransfer.TYPE_IMPORT, data);
-        }
-
         NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
         if(navHostFragment == null)
             return;
diff --git a/app/src/main/java/de/davis/passwordmanager/ui/dashboard/DashboardFragment.java b/app/src/main/java/de/davis/passwordmanager/ui/dashboard/DashboardFragment.java
@@ -81,7 +81,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         arm.registerCreate();
         arm.registerEdit(null);
 
-        SecureElementManager manager = SecureElementManager.createNew(sem -> {
+        SecureElementManager manager = SecureElementManager.getInstance();
+        manager.setTriggerDataChanged(sem -> {
             boolean hasElements = sem.hasElements();
             binding.listPane.progress.setVisibility(View.GONE);
 
diff --git a/app/src/main/java/de/davis/passwordmanager/ui/login/ChangePasswordFragment.java b/app/src/main/java/de/davis/passwordmanager/ui/login/ChangePasswordFragment.java
@@ -1,5 +1,6 @@
 package de.davis.passwordmanager.ui.login;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -100,7 +101,13 @@ public boolean onMenuItemSelected(@NonNull MenuItem menuItem) {
 
                     //if(requireActivity().getIntent().getExtras() == null)
                     ((PasswordManagerApplication)requireActivity().getApplication()).setShouldAuthenticate(false);
-                    startActivity(new Intent(requireContext(), MainActivity.class).setData(requireActivity().getIntent().getData()));
+
+                    boolean intentAuthOnly = requireActivity().getIntent().getBooleanExtra(getString(R.string.preference_authenticate_only), false);
+                    if(intentAuthOnly){
+                        requireActivity().setResult(Activity.RESULT_OK);
+                    }else
+                        startActivity(new Intent(requireContext(), MainActivity.class));
+                    requireActivity().finish();
                     ((PasswordManagerApplication)requireActivity().getApplication()).setShouldAuthenticate(true);
                 }
 
diff --git a/app/src/main/java/de/davis/passwordmanager/ui/login/EnterPasswordFragment.java b/app/src/main/java/de/davis/passwordmanager/ui/login/EnterPasswordFragment.java
@@ -9,7 +9,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.service.autofill.FillRequest;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -70,8 +69,7 @@ public Intent onSuccess() {
                     return i;
                 }
 
-                startActivity(new Intent(getContext(), MainActivity.class)
-                        .setData(requireActivity().getIntent().getData()));
+                startActivity(new Intent(getContext(), MainActivity.class));
                 return null;
             }
         };
diff --git a/app/src/main/java/de/davis/passwordmanager/ui/login/LoginActivity.java b/app/src/main/java/de/davis/passwordmanager/ui/login/LoginActivity.java
@@ -2,14 +2,12 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import de.davis.passwordmanager.R;
-import de.davis.passwordmanager.database.SecureElementDatabase;
 import de.davis.passwordmanager.security.MasterPassword;
 
 public class LoginActivity extends AppCompatActivity {
@@ -22,12 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if(savedInstanceState != null)
             return;
 
-        SecureElementDatabase.createAndGet(this);
 
-        if(getIntent().getBooleanExtra(getString(R.string.preference_authenticate_only), false)){
-            getSupportFragmentManager().beginTransaction().replace(R.id.container, new EnterPasswordFragment()).commit();
-            return;
-        }
 
         boolean masterPasswordAvailable = MasterPassword.getOne().blockingGet() != null;
         if(getIntent().getBooleanExtra(getString(R.string.preference_master_password), false)){
@@ -46,7 +39,7 @@ public static Intent getIntentForAuthentication(@NonNull Context context){
 
     public static Intent getIntentForAuthentication(@NonNull Context context, Intent destActivity){
         Intent intent = new Intent(context, LoginActivity.class);
-        intent.putExtra(context.getString(R.string.preference_authenticate_only), MasterPassword.getOne().blockingGet() != null);
+        intent.putExtra(context.getString(R.string.preference_authenticate_only), true);
 
         if(destActivity != null)
             intent.putExtra(context.getString(R.string.authentication_destination), destActivity);
diff --git a/app/src/main/java/de/davis/passwordmanager/ui/sync/ImportActivity.java b/app/src/main/java/de/davis/passwordmanager/ui/sync/ImportActivity.java
@@ -0,0 +1,49 @@
+package de.davis.passwordmanager.ui.sync;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.AppCompatActivity;
+
+import de.davis.passwordmanager.backup.DataBackup;
+import de.davis.passwordmanager.backup.keygo.KeyGoBackup;
+import de.davis.passwordmanager.databinding.ActivityImportBinding;
+import de.davis.passwordmanager.ui.MainActivity;
+import de.davis.passwordmanager.ui.login.LoginActivity;
+
+public class ImportActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ActivityImportBinding binding = ActivityImportBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        ActivityResultLauncher<Intent> auth = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if(result.getResultCode() != RESULT_OK)
+                return;
+
+            Intent intent = getIntent();
+            if(intent == null || intent.getAction() == null)
+                return;
+
+            if (!intent.getAction().equals(Intent.ACTION_VIEW))
+                return;
+
+            Uri fileUri = intent.getData();
+            if(fileUri == null)
+                return;
+
+            KeyGoBackup backup = new KeyGoBackup(this);
+            backup.execute(DataBackup.TYPE_IMPORT, fileUri, r -> {
+                startActivity(new Intent(this, MainActivity.class));
+            });
+        });
+
+        auth.launch(LoginActivity.getIntentForAuthentication(this));
+        binding.button.setOnClickListener(v -> auth.launch(LoginActivity.getIntentForAuthentication(this)));
+    }
+}
diff --git a/app/src/main/res/layout/activity_import.xml b/app/src/main/res/layout/activity_import.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:context=".ui.sync.ImportActivity">
+
+    <de.davis.passwordmanager.ui.views.InformationView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:information="@string/authenticate_to_import"
+        app:multiline="true"
+        app:title="@string/import_str">
+
+        <Button
+            android:id="@+id/button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/authenticate" />
+    </de.davis.passwordmanager.ui.views.InformationView>
+
+</LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -145,4 +145,5 @@
     <string name="invalid_file">Ungültige Datei</string>
 
     <string name="wait_text">Das könnte ein wenig Zeit in Anspruch nehmen. Bitte haben Sie Geduld</string>
+    <string name="authenticate_to_import">Um ein Backup laden zu können, ist eine Authentifizierung erforderlich</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -188,4 +188,5 @@
     <string name="invalid_file">Invalid file</string>
 
     <string name="wait_text">This might take a little time. Please be patient</string>
+    <string name="authenticate_to_import">To load a backup, authentication is required</string>
 </resources>
