diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java index 529845fc31d9..786364aab271 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java @@ -823,8 +823,6 @@ protected void onCreate(Bundle savedInstanceState) { View mainView = findViewById(android.R.id.content); initNavigationDrawer(mainView); - // Open collection asynchronously - startLoadingCollection(); } protected int getContentViewAttr(int fullscreenMode) { diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Previewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/Previewer.java index ff6f1dd64fb9..cf880dacd620 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/Previewer.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/Previewer.java @@ -39,16 +39,19 @@ public class Previewer extends AbstractFlashcardViewer { @Override protected void onCreate(Bundle savedInstanceState) { Timber.d("onCreate()"); + super.onCreate(savedInstanceState); + mCardList = getIntent().getLongArrayExtra("cardList"); mIndex = getIntent().getIntExtra("index", -1); if (mCardList.length == 0 || mIndex < 0 || mIndex > mCardList.length - 1) { Timber.e("Previewer started with empty card list or invalid index"); finishWithoutAnimation(); + return; } - super.onCreate(savedInstanceState); showBackIcon(); // Ensure navigation drawer can't be opened. Various actions in the drawer cause crashes. disableDrawerSwipe(); + startLoadingCollection(); } @Override diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java index 5d1f47b625d4..becf94637ec9 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java @@ -63,13 +63,14 @@ public class Reviewer extends AbstractFlashcardViewer { @Override protected void onCreate(Bundle savedInstanceState) { Timber.d("onCreate()"); + super.onCreate(savedInstanceState); if (Intent.ACTION_VIEW.equals(getIntent().getAction())) { Timber.d("onCreate() :: received Intent with action = %s", getIntent().getAction()); selectDeckFromExtra(); } - super.onCreate(savedInstanceState); + startLoadingCollection(); } private void selectDeckFromExtra() {