Aggressive retry: interval option

Author: ztc1997

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.ztc1997.fingerprint2sleep"
         minSdkVersion 23
         targetSdkVersion Integer.parseInt("$sdkVer")
-        versionCode 35
-        versionName "0.15.0"
+        versionCode 36
+        versionName "0.15.1"
     }
 
     signingConfigs {

app/src/main/kotlin/com/ztc1997/fingerprint2sleep/activity/SettingsActivity.kt

@@ -50,6 +50,7 @@ class SettingsActivity : Activity() {
         const val PREF_AUTO_RETRY = "pref_auto_retry"
         const val PREF_AUTO_RETRY_BLACK_LIST = "pref_black_list"
         const val PREF_AGGRESSIVE_RETRY = "pref_aggressive_retry"
+        const val PREF_AGGRESSIVE_RETRY_INTERVAL = "pref_aggressive_retry_interval"
         // const val PREF_DONATE = "pref_donate"
         const val PREF_SCREEN_OFF_METHOD = "pref_screen_off_method"
         const val PREF_CATEGORY_SINGLE_TAP = "pref_category_single_tap"
@@ -98,7 +99,7 @@ class SettingsActivity : Activity() {
         val PREF_KEYS_STRING = setOf(PREF_ACTION_SINGLE_TAP, PREF_ACTION_FAST_SWIPE,
                 PREF_SCREEN_OFF_METHOD, PREF_ACTION_SINGLE_TAP_APP,
                 PREF_ACTION_FAST_SWIPE_APP, PREF_ACTION_DOUBLE_TAP, PREF_ACTION_DOUBLE_TAP_APP,
-                PREF_DOUBLE_TAP_INTERVAL)
+                PREF_DOUBLE_TAP_INTERVAL, PREF_AGGRESSIVE_RETRY_INTERVAL)
 
         val PREF_KEYS_STRING_SET = setOf(PREF_BLACK_LIST, PREF_AUTO_RETRY_BLACK_LIST)
 
@@ -253,6 +254,7 @@ class SettingsActivity : Activity() {
 
         val categoryDoubleTap by lazy { findPreference(PREF_CATEGORY_DOUBLE_TAP) as PreferenceCategory }
         val doubleTapInterval by lazy { findPreference(PREF_DOUBLE_TAP_INTERVAL) as ListPreference }
+        val aggressiveRetryInterval by lazy { findPreference(PREF_AGGRESSIVE_RETRY_INTERVAL) as ListPreference }
         val actionDoubleTap by lazy { findPreference(PREF_ACTION_DOUBLE_TAP) as ListPreference }
         val actionDoubleTapApp by lazy { findPreference(PREF_ACTION_DOUBLE_TAP_APP) as AppPickerPreference }
 
@@ -264,7 +266,7 @@ class SettingsActivity : Activity() {
         val licenses: Preference by lazy { findPreference(PREF_LICENSES) }
 
         val listPreferences by lazy {
-            arrayOf(actionSingleTap, doubleTapInterval, actionDoubleTap, screenOffMethod)
+            arrayOf(actionSingleTap, doubleTapInterval, aggressiveRetryInterval, actionDoubleTap, screenOffMethod)
         }
 
         private val loadAppsTask by lazy { LoadAppsTask() }

app/src/main/kotlin/com/ztc1997/fingerprint2sleep/service/FPQAService.kt

@@ -14,10 +14,7 @@ import android.hardware.display.DisplayManager
 import android.media.ImageReader
 import android.media.MediaScannerConnection
 import android.net.Uri
-import android.os.Build
-import android.os.CancellationSignal
-import android.os.Environment
-import android.os.IBinder
+import android.os.*
 import android.support.v4.app.NotificationCompat
 import android.support.v4.content.FileProvider
 import com.eightbitlab.rxbus.Bus
@@ -100,7 +97,8 @@ class FPQAService : Service() {
                 Bus.send(IsScanningChangedEvent(value))
         }
         get() = field and (!defaultDPreference.getPrefBoolean(SettingsActivity.PREF_AGGRESSIVE_RETRY,
-                false) or (System.currentTimeMillis() - lastRestartTime < 20 * 1000))
+                false) or (System.currentTimeMillis() - lastRestartTime < defaultDPreference
+                .getPrefString(SettingsActivity.PREF_AGGRESSIVE_RETRY_INTERVAL, "20000").toInt()))
 
     var isError = false
         set(value) {
@@ -129,6 +127,8 @@ class FPQAService : Service() {
 
     val authenticationCallback by lazy { Callback(quickActions) }
 
+    val handler = Handler()
+
     val receiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
             if (intent == null) return
@@ -245,7 +245,7 @@ class FPQAService : Service() {
         if (!isScanning) {
             isStarting = true
             fingerprintManager.authenticate(null, cancellationSignal, 0, authenticationCallback, null)
-            isStarting = false
+            handler.postDelayed({ isStarting = false }, 100)
             isScanning = true
             lastRestartTime = System.currentTimeMillis()
         }

app/src/main/res/values-zh/strings.xml

@@ -69,6 +69,8 @@
     <string name="title_pref_aggressive_retry">激进重试</string>
     <string name="summary_pref_aggressive_retry">如果经常莫名失效，请尝试</string>
 
+    <string name="title_pref_aggressive_retry_interval">激进重试间隔时间</string>
+
     <string name="title_pref_category_single_tap">单击</string>
 
     <string name="title_pref_action_single_tap">单击操作</string>

app/src/main/res/values/arrays.xml

@@ -54,4 +54,16 @@
         <item>500</item>
         <item>750</item>
     </string-array>
+
+    <string-array name="entries_pref_aggressive_retry_interval" translatable="false">
+        <item>10s</item>
+        <item>20s</item>
+        <item>30s</item>
+    </string-array>
+
+    <string-array name="values_pref_aggressive_retry_interval" translatable="false">
+        <item>10000</item>
+        <item>20000</item>
+        <item>30000</item>
+    </string-array>
 </resources>

app/src/main/res/values/strings.xml

@@ -71,6 +71,8 @@
     <string name="title_pref_aggressive_retry">Aggressive retry</string>
     <string name="summary_pref_aggressive_retry">If it is often not work inexplicable, please try this</string>
 
+    <string name="title_pref_aggressive_retry_interval">Aggressive retry interval time</string>
+
     <string name="title_pref_category_single_tap">Single tap</string>
 
     <string name="title_pref_action_single_tap">Single tap action</string>

app/src/main/res/xml/pref_settings.xml

@@ -57,6 +57,14 @@
                 android:summary="@string/summary_pref_aggressive_retry"
                 android:title="@string/title_pref_aggressive_retry" />
 
+            <ListPreference
+                android:defaultValue="20000"
+                android:dependency="pref_aggressive_retry"
+                android:entries="@array/entries_pref_aggressive_retry_interval"
+                android:entryValues="@array/values_pref_aggressive_retry_interval"
+                android:key="pref_aggressive_retry_interval"
+                android:title="@string/title_pref_aggressive_retry_interval" />
+
         </PreferenceCategory>
 
     </PreferenceScreen>