Revert "Changes to get app closer to working on Ox's Android 9 device"

This reverts commit 8ef9dde.
getlantern · Sep 1, 2023 · 3b9ec19 · 3b9ec19
1 parent 8ef9dde
commit 3b9ec19
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt b/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt
@@ -23,21 +23,21 @@ open class LanternApp : Application() {
             System.setProperty("kotlinx.coroutines.debug", "on")
         }
 
-        // if (BuildConfig.DEBUG) {
-        //     StrictMode.setThreadPolicy(
-        //         StrictMode.ThreadPolicy.Builder()
-        //             .detectAll()
-        //             .penaltyLog()
-        //             .build(),
-        //     )
-        //     StrictMode.setVmPolicy(
-        //         StrictMode.VmPolicy.Builder()
-        //             .detectLeakedSqlLiteObjects()
-        //             .detectLeakedClosableObjects()
-        //             .penaltyLog()
-        //             .build(),
-        //     )
-        // }
+        if (BuildConfig.DEBUG) {
+            StrictMode.setThreadPolicy(
+                StrictMode.ThreadPolicy.Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build(),
+            )
+            StrictMode.setVmPolicy(
+                StrictMode.VmPolicy.Builder()
+                    .detectLeakedSqlLiteObjects()
+                    .detectLeakedClosableObjects()
+                    .penaltyLog()
+                    .build(),
+            )
+        }
     }
 
     override fun onCreate() {

diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt b/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt
@@ -55,9 +55,9 @@ open class LanternService : Service(), Runnable {
     private val started: AtomicBoolean = AtomicBoolean()
     private lateinit var autoUpdater: AutoUpdater
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
         autoUpdater = AutoUpdater(this)
-        val autoBooted = intent?.getBooleanExtra(AUTO_BOOTED, false) == true
+        val autoBooted = intent.getBooleanExtra(AUTO_BOOTED, false)
         Logger.d(TAG, "Called onStartCommand, autoBooted?: $autoBooted")
         if (autoBooted) {
             Logger.debug(

diff --git a/android/build.gradle b/android/build.gradle
@@ -29,8 +29,8 @@ ext {
 
     enableTestCodeCoverage = true
 
-    compileSdkVersion = 33
-    targetSdkVersion = 33
+    compileSdkVersion = 34
+    targetSdkVersion = 34
     minSdkVersion = 23
     androidAnnotationsVersion = '4.8.0'
     androidAnnotationsAPIVersion = '4.8.0'