Invalidate translation caches after update (#1074)

quran · Feb 1, 2019 · 15c9221 · 15c9221
1 parent 4562f22
commit 15c9221
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/app/src/main/java/com/quran/labs/androidquran/database/TranslationsDBAdapter.java b/app/src/main/java/com/quran/labs/androidquran/database/TranslationsDBAdapter.java
@@ -31,6 +31,7 @@ public class TranslationsDBAdapter {
   private final SQLiteDatabase db;
   private final QuranFileUtils quranFileUtils;
   private volatile List<LocalTranslation> cachedTranslations;
+  private long lastWriteTime = 0;
 
   @Inject
   public TranslationsDBAdapter(Context context,
@@ -52,6 +53,10 @@ public SparseArray<LocalTranslation> getTranslationsHash() {
     return result;
   }
 
+  public long getLastWriteTime() {
+    return this.lastWriteTime;
+  }
+
   @WorkerThread
   @NonNull
   public List<LocalTranslation> getTranslations() {
@@ -125,6 +130,7 @@ public boolean writeTranslationUpdates(List<TranslationItem> updates) {
       }
       db.setTransactionSuccessful();
 
+      this.lastWriteTime = System.currentTimeMillis();
       // clear the cached translations
       this.cachedTranslations = null;
     } catch (Exception e) {

diff --git a/...c/main/java/com/quran/labs/androidquran/presenter/translation/BaseTranslationPresenter.kt b/...c/main/java/com/quran/labs/androidquran/presenter/translation/BaseTranslationPresenter.kt
@@ -27,6 +27,7 @@ internal open class BaseTranslationPresenter<T> internal constructor(
     private val translationsAdapter: TranslationsDBAdapter,
     private val translationUtil: TranslationUtil,
     private val quranInfo: QuranInfo) : Presenter<T> {
+  private var lastCacheTime: Long = 0
   private val translationMap: MutableMap<String, LocalTranslation> = HashMap()
 
   var translationScreen: T? = null
@@ -168,14 +169,16 @@ internal open class BaseTranslationPresenter<T> internal constructor(
   }
 
   private fun getTranslationMapSingle(): Single<Map<String, LocalTranslation>> {
-    return if (this.translationMap.isEmpty()) {
+    return if (this.translationMap.isEmpty() ||
+        this.lastCacheTime != translationsAdapter.lastWriteTime) {
       Single.fromCallable<List<LocalTranslation>> { translationsAdapter.translations }
           .map<Map<String, LocalTranslation>> { translations ->
             translations.associateBy { it.filename }
           }
           .subscribeOn(Schedulers.io())
           .observeOn(AndroidSchedulers.mainThread())
           .doOnSuccess { map ->
+            this.lastCacheTime = translationsAdapter.lastWriteTime
             this.translationMap.clear()
             this.translationMap.putAll(map)
           }

diff --git a/...n/java/com/quran/labs/androidquran/presenter/translation/TranslationManagerPresenter.java b/...n/java/com/quran/labs/androidquran/presenter/translation/TranslationManagerPresenter.java
@@ -223,10 +223,15 @@ private List<TranslationItem> mergeWithServerTranslations(List<Translation> serv
       boolean exists = dbFile.exists();
 
       TranslationItem item;
+      TranslationItem override = null;
       if (exists) {
         if (local == null) {
           final Pair<Integer, Integer> versions = getVersionFromDatabase(translation.getFileName());
-          item = new TranslationItem(translation.withSchema(versions.second), versions.first);
+          item = new TranslationItem(translation, versions.first);
+          if (versions.second != translation.getMinimumVersion()) {
+            // schema change, write downloaded schema version to the db and return server item
+            override = new TranslationItem(translation.withSchema(versions.second), versions.first);
+          }
         } else {
           item = new TranslationItem(translation, local.getVersion());
         }
@@ -242,7 +247,13 @@ private List<TranslationItem> mergeWithServerTranslations(List<Translation> serv
       }
 
       if ((local == null && exists) || (local != null && !exists)) {
-        updates.add(item);
+        if (override != null && item.getTranslation().getMinimumVersion() >= 5) {
+          // certain schema changes, especially those going to v5, keep the same filename while
+          // changing the database entry id. this could cause duplicate entries in the database.
+          // work around it by removing the existing entries before doing the updates.
+          translationsDBAdapter.deleteTranslationByFile(override.getTranslation().getFileName());
+        }
+        updates.add(override == null ? item : override);
       } else if (local != null && local.getLanguageCode() == null) {
         // older items don't have a language code
         updates.add(item);