1 files changed, 11 insertions, 25 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index 8d94b4c..70d0bcc 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -35,6 +35,7 @@ public class CommonActivity extends AppCompatActivity {
 
 	protected final static int REQUEST_SHARE = 1;
 	protected static final int REQUEST_VIEWCOMIC = 2;
+	protected static final int REQUEST_PERMISSION_READ_EXTERNAL_STORAGE = 3;
 
 	public static final long MAX_CACHE_SIZE = 100 * 1024 * 1024; // bytes
 
@@ -165,8 +166,17 @@ public class CommonActivity extends AppCompatActivity {
 		return null;
 	}
 
+	public static File getCacheDir(Context ctx) {
+		if (ctx.getExternalCacheDir() != null) {
+			return ctx.getExternalCacheDir();
+		} else {
+			return ctx.getCacheDir();
+		}
+
+	}
+
 	public static String getCacheFileName(Context ctx, String fileName) {
-		File file = new File(ctx.getExternalCacheDir().getAbsolutePath() + "/" + md5(fileName) + ".png");
+		File file = new File(getCacheDir(ctx).getAbsolutePath() + "/" + md5(fileName) + ".png");
 
 		return file.getAbsolutePath();
 	}
@@ -205,34 +215,10 @@ public class CommonActivity extends AppCompatActivity {
 		Intent intent = new Intent(CommonActivity.this, CacheCleanupService.class);
 		startService(intent);
 	}
-	
-	public static boolean isStorageAvailable() {
-
-		String state = Environment.getExternalStorageState();
-
-		return Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
-	}
-	
-	public static boolean isStorageWritable() {
-
-		String state = Environment.getExternalStorageState();
-		return Environment.MEDIA_MOUNTED.equals(state);
-	}
-	
-	/*public synchronized SQLiteDatabase  getReadableDb() {
-		return m_readableDb;
-	}
-
-	public synchronized SQLiteDatabase getWritableDb() {
-		return m_writableDb;
-	} */
 
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-
-//		m_readableDb.close();
-//		m_writableDb.close();
 	}
 
 	public void selectPreviousComic() {