add force reboot

newhinton · Jun 2, 2024 · 44ef6f7 · 44ef6f7
1 parent a5b0157
commit 44ef6f7
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 4 deletions.
diff --git a/app/src/main/java/de/felixnuesse/timedsilence/handler/PreferencesHolder.kt b/app/src/main/java/de/felixnuesse/timedsilence/handler/PreferencesHolder.kt
@@ -22,6 +22,7 @@ class PreferencesHolder(@Transient val mDefaultVolumeValue: Int = 80) {
 
     @EncodeDefault var headsetConnectionCheck = true
     @Transient var shouldRestartOnBoot = false
+    @EncodeDefault var forceRestartOnBoot = false
     @EncodeDefault var showNotifications = true
     @EncodeDefault var runWhenIdle = true
 

diff --git a/app/src/main/java/de/felixnuesse/timedsilence/handler/PreferencesManager.kt b/app/src/main/java/de/felixnuesse/timedsilence/handler/PreferencesManager.kt
@@ -18,6 +18,7 @@ class PreferencesManager(private var mContext: Context) {
         checkIfHeadsetIsConnected()
         shouldShowNotification()
         shouldRestartOnBoot()
+        forceRestartOnBoot()
         runWhenIdle()
         changeRingerVolume()
 
@@ -51,6 +52,16 @@ class PreferencesManager(private var mContext: Context) {
         mPreferencesEditor.apply()
     }
 
+    fun forceRestartOnBoot(): Boolean {
+        mPreferencesHolder.forceRestartOnBoot = mPreferences.getBoolean(getKey(R.string.pref_general_boot_force_restart), mPreferencesHolder.forceRestartOnBoot)
+        return mPreferencesHolder.shouldRestartOnBoot
+    }
+
+    fun setForceRestartOnBoot(restart: Boolean) {
+        mPreferencesEditor.putBoolean(getKey(R.string.pref_general_boot_force_restart), restart)
+        mPreferencesEditor.apply()
+    }
+
     fun shouldShowNotification(): Boolean {
         mPreferencesHolder.showNotifications = mPreferences.getBoolean(getKey(R.string.pref_general_show_notifications_when_paused), mPreferencesHolder.showNotifications)
         return mPreferencesHolder.showNotifications
@@ -144,6 +155,7 @@ class PreferencesManager(private var mContext: Context) {
         mPreferencesEditor.putBoolean(getKey(R.string.pref_calendar_ignore_free), preferences.ignoreFree)
 
         mPreferencesEditor.putBoolean(getKey(R.string.pref_general_change_ringer), preferences.changeRingerVolume)
+        mPreferencesEditor.putBoolean(getKey(R.string.pref_general_boot_force_restart), preferences.forceRestartOnBoot)
         mPreferencesEditor.apply()
     }
 

diff --git a/app/src/main/java/de/felixnuesse/timedsilence/receiver/BluetoothBroadcastReciever.kt b/app/src/main/java/de/felixnuesse/timedsilence/receiver/BluetoothBroadcastReciever.kt
@@ -32,12 +32,12 @@ class BluetoothBroadcastReciever : BroadcastReceiver(){
 
             HeadsetHandler.getPairedDevicesWithDatabaseState(context).forEach {
                 if(address == it.address) {
-                    var volumeHandler = VolumeHandler(context)
+                    val volumeHandler = VolumeHandler(context)
                     volumeHandler.ignoreMusicPlaying(true)
 
-                    var state = VolumeState(it.volumeState)
+                    val state = VolumeState(it.volumeState)
                     state.setReason(REASON_BLUETOOTH_CONNECTED, it.alias)
-                    var supposedState = StateGenerator(context).stateAt(System.currentTimeMillis())
+                    val supposedState = StateGenerator(context).stateAt(System.currentTimeMillis())
 
                     if (supposedState.state > state.state) {
                         volumeHandler.setVolumeStateAndApply(state)

diff --git a/app/src/main/java/de/felixnuesse/timedsilence/receiver/BootReciever.kt b/app/src/main/java/de/felixnuesse/timedsilence/receiver/BootReciever.kt
@@ -17,7 +17,9 @@ class BootReciever : BroadcastReceiver(){
             Log.e(TAG(), "BootReciever: Started Device!")
             VolumeHandler(context).setVolumeStateAndApply(StateGenerator(context).stateAt(System.currentTimeMillis()))
 
-            if(PreferencesManager(context).shouldRestartOnBoot()){
+            val prefs = PreferencesManager(context)
+
+            if(prefs.shouldRestartOnBoot() || prefs.forceRestartOnBoot()){
                 Log.e(TAG(), "BootReciever: Started Checks!")
                 Trigger(context).createAlarmIntime()
                 return

diff --git a/app/src/main/res/values/stringpreferences.xml b/app/src/main/res/values/stringpreferences.xml
@@ -23,6 +23,7 @@
     <string name="pref_general_change_ringer" translatable="false">PREF_INFLUENCE_RINGER_VOLUME</string>
 
     <string name="pref_general_boot_restart" translatable="false">PREF_BOOT_RESTART</string>
+    <string name="pref_general_boot_force_restart" translatable="false">PREF_BOOT_FORCE_RESTART</string>
 
 
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -189,4 +189,5 @@
     <string name="dnd_missing_permissions_title">Missing Permissions!</string>
     <string name="dnd_missing_permission_action_title">Fix!</string>
     <string name="bluetooth_missing_permissions">Bluetooth Access not granted.</string>
+    <string name="force_restart_checks_after_reboot">When the device restarted, also restart checks, regardless of their pre-reboot-state.</string>
 </resources>
diff --git a/app/src/main/res/xml/general_preferences.xml b/app/src/main/res/xml/general_preferences.xml
@@ -19,6 +19,13 @@
             android:defaultValue="true"
             android:title="@string/enablePauseNotification"
             android:key="@string/pref_general_show_notifications_when_paused"/>
+
+        <SwitchPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:defaultValue="false"
+            android:title="@string/force_restart_checks_after_reboot"
+            android:key="@string/pref_general_boot_force_restart" />
     </PreferenceCategory>
 
 </PreferenceScreen>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,6 +23,7 @@
		<string name="pref_general_change_ringer" translatable="false">PREF_INFLUENCE_RINGER_VOLUME</string>

		<string name="pref_general_boot_restart" translatable="false">PREF_BOOT_RESTART</string>
		<string name="pref_general_boot_force_restart" translatable="false">PREF_BOOT_FORCE_RESTART</string>



Expand Down