meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix null currentActivity

Browse source
This commit is contained in:
andrekir 2022-09-13 01:25:36 -03:00
parent 99e9502a29
commit c2d681b11e
3 changed files with 19 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
View file

@ -32,10 +32,9 @@ open class GeeksvilleApplication(
companion object {
lateinit var analytics: AnalyticsProvider
var currentActivity: Activity? = null
private val backstack = mutableListOf<Activity>()
}
var splunk: AnalyticsProvider? = null
private val lifecycleCallbacks = object : ActivityLifecycleCallbacks {
override fun onActivityPaused(activity: Activity) {
}
@ -44,7 +43,8 @@ open class GeeksvilleApplication(
}
override fun onActivityDestroyed(activity: Activity) {
currentActivity = null
if (backstack.contains(activity)) backstack.remove(activity)
currentActivity = backstack.lastOrNull()
}
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
@ -54,7 +54,8 @@ open class GeeksvilleApplication(
}
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
currentActivity = activity
backstack.add(activity)
currentActivity = backstack.lastOrNull()
}
override fun onActivityResumed(activity: Activity) {
@ -72,16 +73,13 @@ open class GeeksvilleApplication(
}
private val analyticsPrefs: SharedPreferences by lazy {
getSharedPreferences(
"analytics-prefs",
Context.MODE_PRIVATE
)
getSharedPreferences("analytics-prefs", Context.MODE_PRIVATE)
}
var isAnalyticsAllowed: Boolean
get() = analyticsPrefs.getBoolean("allowed", true)
set(value) {
analyticsPrefs.edit(commit = true) {
analyticsPrefs.edit {
putBoolean("allowed", value)
}
@ -112,13 +110,3 @@ open class GeeksvilleApplication(
}
}
fun geeksvilleApp(context: Context) = context.applicationContext as GeeksvilleApplication
interface GeeksvilleApplicationClient {
fun getAnalytics() = GeeksvilleApplication.analytics
}