Skip to content

Commit eaa8ded

Browse files
author
Tuomas Airaksinen
committed
Fix #3188 (Calculator shows two times in startup)
1 parent 907e1c9 commit eaa8ded

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

app/src/main/java/net/bible/android/view/activity/StartupActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ import net.bible.service.sword.SwordDocumentFacade
6969
import org.apache.commons.lang3.StringUtils
7070
import java.util.*
7171

72+
73+
var comingFromStartupActivity = false
74+
7275
/** Called first to show download screen if no documents exist
7376
*
7477
* @author Martin Denham [mjdenham at gmail dot com]
@@ -417,6 +420,7 @@ open class StartupActivity : CustomTitlebarActivityBase() {
417420
}
418421
}
419422
CommonUtils.initializeAppCoroutine()
423+
comingFromStartupActivity = true
420424
startActivity(handlerIntent)
421425
finish()
422426
}

app/src/main/java/net/bible/android/view/activity/base/ActivityBase.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import kotlinx.coroutines.launch
4141
import kotlinx.coroutines.sync.Mutex
4242
import kotlinx.coroutines.sync.withLock
4343
import net.bible.android.view.activity.StartupActivity
44+
import net.bible.android.view.activity.comingFromStartupActivity
4445
import net.bible.android.view.activity.discrete.CalculatorActivity
4546
import net.bible.android.view.util.UiUtils.setActionBarColor
4647
import net.bible.android.view.util.locale.LocaleHelper
@@ -235,8 +236,11 @@ abstract class ActivityBase : AppCompatActivity(), AndBibleActivity {
235236
CurrentActivityHolder.activate(this)
236237
super.onResume()
237238
Log.i(TAG, "onResume wasPaused:$wasPaused returningFromCalculator:$returningFromCalculator")
239+
val fromStartupActivity = comingFromStartupActivity
240+
comingFromStartupActivity = false
238241
if (
239242
this !is CalculatorActivity
243+
&& !fromStartupActivity
240244
&& this !is StartupActivity
241245
&& CommonUtils.showCalculator
242246
&& wasPaused

0 commit comments

Comments
 (0)