Filter broken prayer ids from bookmarks and reset the recents

when a new db is copied

Author: arashpayan

app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 18
-        versionName '2.1.0'
+        versionName '2.1.1'
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/proguard-rules.pro

@@ -16,11 +16,3 @@
 #   public *;
 #}
 -keepattributes *Annotation*
--keepclassmembers class ** {
-    @com.squareup.otto.Subscribe public *;
-    @com.squareup.otto.Produce public *;
-}
-
--keepclassmembers class android.support.design.internal.BottomNavigationMenuView {
-    boolean mShiftingMode;
-}

app/src/main/java/com/arashpayan/prayerbook/App.java

@@ -5,6 +5,7 @@
 import android.os.Looper;
 import android.webkit.WebSettings;
 
+import com.arashpayan.prayerbook.database.Prayer;
 import com.arashpayan.prayerbook.database.PrayersDB;
 import com.arashpayan.prayerbook.database.UserDB;
 import com.arashpayan.prayerbook.thread.UiRunnable;
@@ -17,10 +18,12 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 
 public class App extends Application {
@@ -29,20 +32,22 @@ public class App extends Application {
     private ExecutorService mExecutor;
 
     private static volatile App app;
-    private static final int LatestDatabaseVersion = 20;
+    private static final int LatestDatabaseVersion = 21;
 
     @Override
     public void onCreate() {
         app = this;
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
         super.onCreate();
 
-        Prefs.init(this);
-        copyDatabaseFile();
-        UserDB.set(new UserDB(this, false));
         mMainThreadHandler = new Handler(Looper.getMainLooper());
         mExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
+        Prefs.init(this);
+        UserDB.set(new UserDB(this, false));
+        UserDB.get().addBookmark(44);
+        copyDatabaseFile();
+
         // Load as much of the webview libraries as much as possible in the background
         // https://groups.google.com/a/chromium.org/d/msg/android-webview-dev/hjn1h7dBlH8/Iv0j08O6AQAJ
         runInBackground(new WorkerRunnable() {
@@ -72,12 +77,25 @@ private void copyDatabaseFile() {
                 is.close();
                 os.close();
                 Prefs.get().setDatabaseVersion(LatestDatabaseVersion);
+                filterBrokenPrayerIds(PrayersDB.get(), UserDB.get());
             } catch (IOException ex) {
                 L.w("Error writing prayer database", ex);
             }
         }
     }
 
+    private void filterBrokenPrayerIds(@NonNull PrayersDB db, UserDB userDB) {
+        ArrayList<Long> bookmarks = userDB.getBookmarks();
+        for (Long id : bookmarks) {
+            Prayer prayer = db.getPrayer(id);
+            if (prayer == null) {
+                userDB.deleteBookmark(id);
+            }
+        }
+
+        userDB.clearRecents();
+    }
+
     @AnyThread
     public static void runOnUiThread(UiRunnable r) {
         app.mMainThreadHandler.post(r);

app/src/main/java/com/arashpayan/prayerbook/CategoriesFragment.java

@@ -68,7 +68,7 @@ public void run() {
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.categories, menu);
     }
 

app/src/main/java/com/arashpayan/prayerbook/PrayerFragment.java

@@ -99,7 +99,7 @@ public void run() {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         requireActivity().getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
 
-        mWebView = new WebView(this.getActivity());
+        mWebView = new WebView(requireContext());
         mWebView.getSettings().setSupportZoom(true);
         mWebView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         mWebView.setKeepScreenOn(true);

app/src/main/java/com/arashpayan/prayerbook/database/PrayersDB.java

@@ -160,15 +160,15 @@ public Cursor getPrayersWithKeywords(String []keywords, Language[] languages) {
     }
 
     @WorkerThread
-    @NonNull
+    @Nullable
     public Prayer getPrayer(long prayerId) {
         String[] cols = {PRAYERTEXT_COLUMN, AUTHOR_COLUMN, CITATION_COLUMN, SEARCHTEXT_COLUMN, LANGUAGE_COLUMN};
         String selectionClause = ID_COLUMN + "=?";
         String[] selectionArgs = {Long.valueOf(prayerId).toString()};
 
         try (Cursor c = pbDatabase.query(PRAYERS_TABLE, cols, selectionClause, selectionArgs, null, null, null)) {
             if (!c.moveToFirst()) {
-                throw new RuntimeException("Invalid prayer id: " + prayerId);
+                return null;
             }
 
             Prayer p = new Prayer();