Request WRITE_EXTERNAL_STORAGE to fix the Android Lollipop problem.

Even though it should not be necessary: #5
murraycu · Nov 19, 2014 · 75aa986 · 75aa986
1 parent 18051ec
commit 75aa986
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.murrayc.galaxyzoo.app" >
 
+    <!-- TODO: We shouldn't need these after SDK version 18, but Android 5.0 "Lollipop" (API 21) seems
+    to need them again.
+    See https://github.com/murraycu/android-galaxyzoo/issues/5 . -->
+    <!--
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
+    -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 

diff --git a/app/src/main/java/com/murrayc/galaxyzoo/app/provider/ItemsContentProvider.java b/app/src/main/java/com/murrayc/galaxyzoo/app/provider/ItemsContentProvider.java
@@ -536,15 +536,15 @@ private String createCacheFile(final String filename) {
                 Log.info("createFileUri(): subject id=" + subjectId +", file created: " + realFile.getAbsolutePath());
             }
             */
-        }  catch (UnsupportedOperationException e) {
+        }  catch (final UnsupportedOperationException e) {
             //This happens while running under ProviderTestCase2.
             //so we just catch it and provide a useful value,
             //so at least the other functionality can be tested.
             //TODO: Find a way to let it succeed.
-            Log.error("createCacheFile(): Unsupported operation", e);
+            Log.error("createCacheFile(): Unsupported operation for filename=" + file.getAbsolutePath(), e);
             return "testuri";
         } catch (final IOException e) {
-            Log.error("createCacheFile(): IOException", e);
+            Log.error("createCacheFile(): IOException for filename=" + file.getAbsolutePath(), e);
             return null;
         }