maybe stop removing cached files all the time

2 files changed, 18 insertions, 15 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 e6191be..a224356 100644..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
@@ -164,10 +164,8 @@ public class CommonActivity extends AppCompatActivity {
 	}

 

 	public static String getCacheFileName(Context ctx, String fileName) {

-		String hash = md5(fileName);

-		

-		File file = new File(ctx.getExternalCacheDir().getAbsolutePath() + "/" + hash + ".png");

-		

+		File file = new File(ctx.getExternalCacheDir().getAbsolutePath() + "/" + md5(fileName) + ".png");

+

 		return file.getAbsolutePath();

 	}

 	

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
index a07614e..fbe02e9 100644..100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileOutputStream;

 import java.io.IOException;

 import java.io.InputStream;

+import java.util.Date;

 

 public class DatabaseHelper extends SQLiteOpenHelper {

 	

@@ -327,20 +328,24 @@ public class DatabaseHelper extends SQLiteOpenHelper {
 											try {

 												File thumbnailFile = new File(CommonActivity.getCacheFileName(m_context, filePath));

 

-												if (CommonActivity.isStorageWritable() && (!thumbnailFile.exists() || fullRescan)) {

-													InputStream is = cba.getItem(0);

+												if (CommonActivity.isStorageWritable()) {

+													if (!thumbnailFile.exists() || fullRescan) {

+														InputStream is = cba.getItem(0);

 

-													if (is != null) {

-														FileOutputStream fos = new FileOutputStream(thumbnailFile);

+														if (is != null) {

+															FileOutputStream fos = new FileOutputStream(thumbnailFile);

 

-														byte[] buffer = new byte[1024];

-														int len;

-														while ((len = is.read(buffer)) != -1) {

-															fos.write(buffer, 0, len);

-														}

+															byte[] buffer = new byte[1024];

+															int len;

+															while ((len = is.read(buffer)) != -1) {

+																fos.write(buffer, 0, len);

+															}

 

-														fos.close();

-														is.close();

+															fos.close();

+															is.close();

+														}

+													} else if (thumbnailFile.exists()) {

+														thumbnailFile.setLastModified(new Date().getTime());

 													}

 												}