Grant IO permissions to run on API > 21 devices

rral0 · Apr 15, 2019 · fe51556 · fe51556
1 parent 03dd5c1
commit fe51556
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/ResetAppStateTestCase.java b/collect_app/src/androidTest/java/org/odk/collect/android/ResetAppStateTestCase.java
@@ -16,15 +16,18 @@
 
 package org.odk.collect.android;
 
+import android.Manifest;
 import android.content.ContentValues;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.preference.PreferenceManager;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.application.Collect;
@@ -48,6 +51,12 @@
 @RunWith(AndroidJUnit4.class)
 public class ResetAppStateTestCase {
 
+    @Rule
+    public GrantPermissionRule permissionRule = GrantPermissionRule.grant(
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+    );
+
     @Before
     public void setUp() throws IOException {
         resetAppState(Arrays.asList(

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/dao/InstancesDaoTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/dao/InstancesDaoTest.java
@@ -16,11 +16,14 @@
 
 package org.odk.collect.android.dao;
 
+import android.Manifest;
 import android.database.Cursor;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.application.Collect;
@@ -39,6 +42,12 @@ public class InstancesDaoTest {
 
     private InstancesDao instancesDao;
 
+    @Rule
+    public GrantPermissionRule permissionRule = GrantPermissionRule.grant(
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+    );
+
     @Before
     public void setUp() {
         instancesDao = new InstancesDao();

diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/ResetUtility.java b/collect_app/src/main/java/org/odk/collect/android/utilities/ResetUtility.java
@@ -113,9 +113,10 @@ private boolean deleteFolderContents(String path) {
         File file = new File(path);
         if (file.exists()) {
             File[] files = file.listFiles();
-
-            for (File f : files) {
-                result = deleteRecursive(f);
+            if (files != null) {
+                for (File f : files) {
+                    result = deleteRecursive(f);
+                }
             }
         }
         return result;