Merge branch 'release/5.59.1' into main

cmonfortep · cmonfortep · commit 77ef60291020 · 2020-07-05T22:46:56.000+02:00
diff --git a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
@@ -194,6 +194,7 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO
         scheduleOfflinePixels()
 
         notificationRegistrar.registerApp()
+        registerReceiver(shortcutReceiver, IntentFilter(ShortcutBuilder.USE_OUR_APP_SHORTCUT_ADDED_ACTION))
 
         initializeHttpsUpgrader()
         submitUnsentFirePixels()
@@ -299,7 +300,6 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO
             Timber.i("Suppressing app launch pixel")
             return
         }
-        registerReceiver(shortcutReceiver, IntentFilter(ShortcutBuilder.USE_OUR_APP_SHORTCUT_ADDED_ACTION))
         pixel.fire(APP_LAUNCH)
     }
 
@@ -312,11 +312,6 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO
         }
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    fun onAppStopped() {
-        unregisterReceiver(shortcutReceiver)
-    }
-
     companion object {
         private const val APP_RESTART_CAUSED_BY_FIRE_GRACE_PERIOD: Long = 10_000L
     }
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1 +1 @@
-VERSION=5.59.0
+VERSION=5.59.1

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO`
`194`	`194`	`scheduleOfflinePixels()`
`195`	`195`
`196`	`196`	`notificationRegistrar.registerApp()`
	`197`	`+ registerReceiver(shortcutReceiver, IntentFilter(ShortcutBuilder.USE_OUR_APP_SHORTCUT_ADDED_ACTION))`
`197`	`198`
`198`	`199`	`initializeHttpsUpgrader()`
`199`	`200`	`submitUnsentFirePixels()`
`@@ -299,7 +300,6 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO`
`299`	`300`	`Timber.i("Suppressing app launch pixel")`
`300`	`301`	`return`
`301`	`302`	`}`
`302`		`- registerReceiver(shortcutReceiver, IntentFilter(ShortcutBuilder.USE_OUR_APP_SHORTCUT_ADDED_ACTION))`
`303`	`303`	`pixel.fire(APP_LAUNCH)`
`304`	`304`	`}`
`305`	`305`
`@@ -312,11 +312,6 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
`315`		`- @OnLifecycleEvent(Lifecycle.Event.ON_STOP)`
`316`		`- fun onAppStopped() {`
`317`		`- unregisterReceiver(shortcutReceiver)`
`318`		`- }`
`319`		`-`
`320`	`315`	`companion object {`
`321`	`316`	`private const val APP_RESTART_CAUSED_BY_FIRE_GRACE_PERIOD: Long = 10_000L`
`322`	`317`	`}`