keep display on for entire duration of the mixing

planetdecred · May 12, 2021 · 9f571d2 · 9f571d2
1 parent 126f5fb
commit 9f571d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/com/dcrandroid/activities/privacy/AccountMixerActivity.kt b/app/src/main/java/com/dcrandroid/activities/privacy/AccountMixerActivity.kt
@@ -9,6 +9,7 @@ package com.dcrandroid.activities.privacy
 import android.content.DialogInterface
 import android.os.Bundle
 import android.text.Html
+import android.view.WindowManager
 import com.dcrandroid.BuildConfig
 import com.dcrandroid.R
 import com.dcrandroid.activities.BaseActivity
@@ -172,6 +173,8 @@ class AccountMixerActivity : BaseActivity(), AccountMixerNotificationListener, T
 
     private fun stopAccountMixer() = GlobalScope.launch(Dispatchers.Default) {
         multiWallet?.stopAccountMixer(wallet.id)
+        // Allow display to timeout after mixer is stopped
+        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
     override fun onAccountMixerEnded(walletID: Long) {
@@ -180,6 +183,8 @@ class AccountMixerActivity : BaseActivity(), AccountMixerNotificationListener, T
             setMixerStatus()
             GlobalScope.launch(Dispatchers.Main) {
                 mixer_toggle_switch.isChecked = false
+                // Allow display to timeout after mixer completes
+                window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
             }
         }
     }
@@ -189,6 +194,8 @@ class AccountMixerActivity : BaseActivity(), AccountMixerNotificationListener, T
         setMixerStatus()
         GlobalScope.launch(Dispatchers.Main) {
             mixer_toggle_switch.isChecked = true
+            // Prevent display from timing out after mixer starts
+            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         }
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -569,7 +569,7 @@
     <string name="mix_tx_change">Mix transaction change</string>
     <string name="mix_tx_change_summary">Change from transactions will be sent to unmixed account if enabled.</string>
     <string name="change_sent_to_unmixed"><![CDATA[Change will be sent to <b>%1$s</b>.]]></string>
-    <string name="start_mixer_warning">Your wallet will be unlocked until mixing completes.</string>
+    <string name="start_mixer_warning">Your wallet will be unlocked and your display would remain on until mixing completes.</string>
     <string name="mixer_has_stopped_running">cspp mixer has stopped running</string>
     <string name="no_mixable_output">Unmixed account has no mixable output</string>
     <string name="new_caps">NEW</string>
@@ -596,7 +596,7 @@
     <string name="mix_server">Mix server</string>
     <string name="keep_app_opened">Keep this app opened</string>
     <string name="mixer_help_title">How to use the mixer?</string>
-    <string name="mixer_help_desc"><![CDATA[When you turn on the mixer, your unmixed DCRs in this wallet (unmixed balance) will be gradually mixed.<br/><br/><b><font color="#091440">Important: keep this app opened while mixer is running.</font></b><br/><br/>Mixer will automatically stop when unmixed balance are fully mixed.]]></string>
+    <string name="mixer_help_desc"><![CDATA[When you turn on the mixer, your unmixed DCRs in this wallet (unmixed balance) will be gradually mixed.<br/><br/><b><font color="#091440">Important: keep this app opened while mixer is running. Your display would not timeout until the mixer completes, this may impact your battery life.</font></b><br/><br/>Mixer will automatically stop when unmixed balance are fully mixed.]]></string>
     <string name="mixer_is_running">Mixer is running…</string>
     <string name="keep_this_app_opened">Keep this app opened</string>
     <string name="mixer_status_info">Mixer will automatically stop when unmixed balance are fully mixed.</string>