Ignore autofill if db not configured

Author: sorz

app/src/main/java/org/sorz/lab/tinykeepass/BaseActivity.java

@@ -86,10 +86,6 @@ protected void getDatabaseKeys(Consumer<List<String>> onKeyRetrieved,
         getKey();
     }
 
-    protected File getDatabaseFile() {
-        return new File(getNoBackupFilesDir(), FetchDatabaseTask.DB_FILENAME);
-    }
-
     private void getKey() {
         int authMethod = preferences.getInt("key-auth-method", 0);
         switch (authMethod) {

app/src/main/java/org/sorz/lab/tinykeepass/MainActivity.java

@@ -12,6 +12,9 @@
 import de.slackspace.openkeepass.domain.KeePassFile;
 import de.slackspace.openkeepass.exception.KeePassDatabaseUnreadableException;
 
+import static org.sorz.lab.tinykeepass.keepass.KeePassHelper.getDatabaseFile;
+import static org.sorz.lab.tinykeepass.keepass.KeePassHelper.hasDatabaseConfigured;
+
 public class MainActivity extends BaseActivity {
     private final static String TAG = MainActivity.class.getName();
 
@@ -24,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     .add(R.id.fragment_container, new DatabaseLockedFragment())
                     .commit();
 
-            if (!hasConfiguredDatabase()) {
+            if (!hasDatabaseConfigured(this)) {
                 doConfigureDatabase();
                 finish();
             } else {
@@ -45,17 +48,13 @@ public void onNewIntent(Intent intent) {
             showEntryList();
     }
 
-    public boolean hasConfiguredDatabase() {
-        return KeePassStorage.get() != null || getDatabaseFile().canRead();
-    }
-
     public void doUnlockDatabase() {
         if (KeePassStorage.get() != null) {
             showEntryList();
         } else {
             getDatabaseKeys(keys -> {
                 try {
-                    KeePassFile db = KeePassDatabase.getInstance(getDatabaseFile())
+                    KeePassFile db = KeePassDatabase.getInstance(getDatabaseFile(this))
                             .openDatabase(keys.get(0));
                     KeePassStorage.set(this, db);
                 } catch (KeePassDatabaseUnreadableException | UnsupportedOperationException e) {
@@ -98,7 +97,7 @@ public void doSyncDatabase() {
 
     public void doCleanDatabase() {
         KeePassStorage.set(this, null);
-        if (!getDatabaseFile().delete())
+        if (!getDatabaseFile(this).delete())
             Log.w(TAG, "fail to delete database file");
         getSecureStringStorage().clear();
         snackbar(getString(R.string.clean_config_ok), Snackbar.LENGTH_SHORT).show();

app/src/main/java/org/sorz/lab/tinykeepass/autofill/BaseActivity.java

@@ -18,6 +18,8 @@
 import de.slackspace.openkeepass.domain.KeePassFile;
 import de.slackspace.openkeepass.exception.KeePassDatabaseUnreadableException;
 
+import static org.sorz.lab.tinykeepass.keepass.KeePassHelper.getDatabaseFile;
+
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 abstract class BaseActivity extends org.sorz.lab.tinykeepass.BaseActivity {
@@ -62,7 +64,7 @@ protected StructureParser.Result parseStructure() {
 
     protected void unlockDatabase(List<String> keys) {
         try {
-            KeePassFile db = KeePassDatabase.getInstance(getDatabaseFile())
+            KeePassFile db = KeePassDatabase.getInstance(getDatabaseFile(this))
                     .openDatabase(keys.get(0));
             KeePassStorage.set(this, db);
         } catch (KeePassDatabaseUnreadableException | UnsupportedOperationException e) {

app/src/main/java/org/sorz/lab/tinykeepass/autofill/TinyAutofillService.java

@@ -18,6 +18,8 @@
 
 import org.sorz.lab.tinykeepass.R;
 
+import static org.sorz.lab.tinykeepass.keepass.KeePassHelper.hasDatabaseConfigured;
+
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 public class TinyAutofillService extends AutofillService {
@@ -26,8 +28,11 @@ public class TinyAutofillService extends AutofillService {
     public void onFillRequest(@NonNull FillRequest request,
                               @NonNull CancellationSignal cancellationSignal,
                               @NonNull FillCallback callback) {
-
         cancellationSignal.setOnCancelListener(() -> Log.d(TAG, "autofill canceled."));
+        if (!hasDatabaseConfigured(this)) {
+            callback.onSuccess(null);
+            return;
+        }
 
         AssistStructure structure = request.getFillContexts()
                 .get(request.getFillContexts().size() - 1).getStructure();
@@ -49,8 +54,6 @@ public void onFillRequest(@NonNull FillRequest request,
         callback.onSuccess(responseBuilder.build());
     }
 
-
-
     @Override
     public void onSaveRequest(@NonNull SaveRequest request, @NonNull SaveCallback callback) {
         callback.onFailure(getString(R.string.autofill_not_support_save));

app/src/main/java/org/sorz/lab/tinykeepass/keepass/KeePassHelper.java

@@ -1,8 +1,12 @@
 package org.sorz.lab.tinykeepass.keepass;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
+import org.sorz.lab.tinykeepass.FetchDatabaseTask;
+
+import java.io.File;
 import java.util.UUID;
 import java.util.stream.Stream;
 
@@ -41,4 +45,12 @@ static public Bitmap getIcon(Entry entry) {
         return BitmapFactory.decodeByteArray(entry.getIconData(), 0,
                 entry.getIconData().length);
     }
+
+    static public File getDatabaseFile(Context context) {
+        return new File(context.getNoBackupFilesDir(), FetchDatabaseTask.DB_FILENAME);
+    }
+
+    static public boolean hasDatabaseConfigured(Context context) {
+        return KeePassStorage.get() != null || getDatabaseFile(context).canRead();
+    }
 }