Fix file URI crash

bpellin · Jun 25, 2018 · f41ae3a · f41ae3a
1 parent 3d56f43
commit f41ae3a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+KeePassDroid (2.3.4)
+ * Fix crash
+
 KeePassDroid (2.3.3)
  * Merge 2.3 branch
 

diff --git a/app/app.iml b/app/app.iml
@@ -149,6 +149,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/general" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
@@ -180,6 +181,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/play" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 26
 
-        versionCode = 177
-        versionName = "2.3.3"
+        versionCode = 178
+        versionName = "2.3.4"
 
         testApplicationId = "com.keepassdroid.tests"
         testInstrumentationRunner = "android.test.InstrumentationTestRunner"

diff --git a/app/src/main/java/com/keepassdroid/PasswordActivity.java b/app/src/main/java/com/keepassdroid/PasswordActivity.java
@@ -566,9 +566,20 @@ private void loadDatabase(
         loadDatabase(pass, UriUtil.parseDefaultFile(keyfile));
     }
 
+    private boolean hasFileUri(Uri uri) {
+        try {
+            if (uri == null) { return false; }
+
+            return uri.getScheme().equalsIgnoreCase("file");
+        } catch (Exception e) {
+            return false;
+        }
+
+    }
+
     private boolean checkFilePermissions(Uri db, Uri keyfile) {
-        boolean hasFileUri = db.getScheme().equals("file") ||
-                keyfile.getScheme().equals("file");
+        boolean hasFileUri = hasFileUri(db) ||
+                hasFileUri(keyfile);
 
         if (!hasFileUri) return true;