Fix service auto start

r3bl-org · Jun 14, 2020 · 49d98da · 49d98da
1 parent f644cb3
commit 49d98da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,8 @@ android {
     applicationId "com.r3bl.stayawake"
     minSdkVersion 25
     targetSdkVersion 28
-    versionCode 14
-    versionName "2.2"
+    versionCode 15
+    versionName "2.3"
   }
   buildTypes {
     release {

diff --git a/app/src/main/java/com/r3bl/stayawake/MainActivity.kt b/app/src/main/java/com/r3bl/stayawake/MainActivity.kt
@@ -100,7 +100,7 @@ class MainActivity : AppCompatActivity() {
       MyTileService.fireIntentWithStartService(this)
       d(TAG, "MainActivity.handleAutoStartOfService: Initiate auto start")
     }
-    else d(TAG, "MainActivity.handleAutoStartOfService: Do nothing, auto start disabled")
+    else d(TAG, "MainActivity.handleAutoStartOfService: Do not auto start")
   }
 
   private fun setupCheckbox() = mySettingsHolder.value.autoStartEnabled.let { autoStartEnabled ->

diff --git a/app/src/main/java/com/r3bl/stayawake/MyTileService.kt b/app/src/main/java/com/r3bl/stayawake/MyTileService.kt
@@ -88,7 +88,7 @@ class MyTileService : TileService() {
       commandStart()
       d(TAG, "MyTileService.handleAutoStartOfService: Initiate auto start")
     }
-    else d(TAG, "MyTileService.handleAutoStartOfService: Do nothing, auto start disabled")
+    else d(TAG, "MyTileService.handleAutoStartOfService: Do not auto start")
   }
 
   override fun onDestroy() {
@@ -431,9 +431,7 @@ class MyTileService : TileService() {
       val intentFilter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
       val batteryStatus = context.applicationContext.registerReceiver(null, intentFilter)
       val status = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1)
-      return status == BatteryManager.BATTERY_STATUS_CHARGING ||
-             status == BatteryManager.BATTERY_STATUS_FULL ||
-             status == BatteryManager.BATTERY_PLUGGED_AC ||
+      return status == BatteryManager.BATTERY_PLUGGED_AC ||
              status == BatteryManager.BATTERY_PLUGGED_WIRELESS ||
              status == BatteryManager.BATTERY_PLUGGED_USB
     }

diff --git a/app/src/main/java/com/r3bl/stayawake/PowerConnectionReceiver.kt b/app/src/main/java/com/r3bl/stayawake/PowerConnectionReceiver.kt
@@ -69,7 +69,7 @@ class PowerConnectionReceiver(private val myContext: Context) : BroadcastReceive
       d(TAG, message)
     }
     else {
-      val message = "onReceive: PowerConnectionReceiver ACTION_POWER_CONNECTED ... Do nothing, auto start disabled"
+      val message = "onReceive: PowerConnectionReceiver ACTION_POWER_CONNECTED ... Do not auto start"
       // showToast(myContext, message)
       d(TAG, message)
     }
@@ -83,7 +83,7 @@ class PowerConnectionReceiver(private val myContext: Context) : BroadcastReceive
       d(TAG, message)
     }
     else {
-      val message = "onReceive: PowerConnectionReceiver ACTION_POWER_DISCONNECTED ... Do nothing, auto start disabled"
+      val message = "onReceive: PowerConnectionReceiver ACTION_POWER_DISCONNECTED ... Do not auto start"
       // showToast(myContext, message)
       d(TAG, message)
     }