refactor: extract Collection to parameter

The method is always called from onCollectionLoaded so we can remove a dependency
Tyler-Programs · Oct 13, 2021 · 8d4d901 · 8d4d901
1 parent 3b18e99
commit 8d4d901
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
@@ -827,7 +827,7 @@ protected void onCollectionLoaded(Collection col) {
 
         registerExternalStorageListener();
 
-        restoreCollectionPreferences();
+        restoreCollectionPreferences(col);
 
         initLayout();
 
@@ -1741,11 +1741,11 @@ protected SharedPreferences restorePreferences() {
     }
 
 
-    protected void restoreCollectionPreferences() {
+    protected void restoreCollectionPreferences(Collection col) {
 
         // These are preferences we pull out of the collection instead of SharedPreferences
         try {
-            mShowNextReviewTime = getCol().get_config_boolean("estTimes");
+            mShowNextReviewTime = col.get_config_boolean("estTimes");
 
             // Dynamic don't have review options; attempt to get deck-specific auto-advance options
             // but be prepared to go with all default if it's a dynamic deck

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java
@@ -1115,9 +1115,9 @@ protected void initControls() {
         }
     }
 
-    protected void restoreCollectionPreferences() {
-        super.restoreCollectionPreferences();
-        mShowRemainingCardCount = getCol().get_config_boolean("dueCounts");
+    protected void restoreCollectionPreferences(Collection col) {
+        super.restoreCollectionPreferences(col);
+        mShowRemainingCardCount = col.get_config_boolean("dueCounts");
     }
 
     @Override