Add exact alarm message

2025-12-04 15:49:33 +01:00 · 2021-12-22 17:23:57 +01:00
parent d6bd80c9c0
commit 004fffa992
6 changed files with 200 additions and 121 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DurationDialogFragmentCompat.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DurationDialogFragmentCompat.kt
@@ -19,7 +19,13 @@
 */
 package com.kunzisoft.keepass.settings.preferencedialogfragment

+import android.app.AlarmManager
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
+import android.util.Log
 import android.view.View
 import android.widget.NumberPicker
 import com.kunzisoft.keepass.R
@@ -62,6 +68,30 @@ class DurationDialogFragmentCompat : InputPreferenceDialogFragmentCompat() {
        }
    }

+    override fun onResume() {
+        super.onResume()
+
+        (context?.applicationContext?.getSystemService(Context.ALARM_SERVICE) as AlarmManager?)?.let { alarmManager ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+                && !alarmManager.canScheduleExactAlarms()) {
+                setExplanationText(R.string.warning_exact_alarm)
+                setExplanationButton(R.string.permission) {
+                    // Open the exact alarm permission screen
+                    try {
+                        startActivity(Intent().apply {
+                            action = ACTION_REQUEST_SCHEDULE_EXACT_ALARM
+                        })
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Unable to open exact alarm permission screen", e)
+                    }
+                }
+            } else {
+                explanationText = ""
+                setExplanationButton("") {}
+            }
+        }
+    }
+
    private fun durationToDaysHoursMinutesSeconds(duration: Long) {
        if (duration < 0) {
            mEnabled = false
@@ -164,6 +194,7 @@ class DurationDialogFragmentCompat : InputPreferenceDialogFragmentCompat() {
    }

    companion object {
+        private const val TAG = "DurationDialogFrgCmpt"
        private const val ENABLE_KEY = "ENABLE_KEY"
        private const val DAYS_KEY = "DAYS_KEY"
        private const val HOURS_KEY = "HOURS_KEY"
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/InputPreferenceDialogFragmentCompat.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/InputPreferenceDialogFragmentCompat.kt
@@ -22,6 +22,7 @@ package com.kunzisoft.keepass.settings.preferencedialogfragment
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
+import android.widget.Button
 import android.widget.CompoundButton
 import android.widget.EditText
 import android.widget.TextView
@@ -35,6 +36,7 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
    private var inputTextView: EditText? = null
    private var textUnitView: TextView? = null
    private var textExplanationView: TextView? = null
+    private var explanationButton: Button? = null
    private var switchElementView: CompoundButton? = null

    private var mOnInputTextEditorActionListener: TextView.OnEditorActionListener? = null
@@ -100,6 +102,27 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
        explanationText = getString(explanationTextId)
    }

+    val explanationButtonText: String?
+        get() = explanationButton?.text?.toString() ?: ""
+
+    fun setExplanationButton(explanationButtonText: String?, clickListener: View.OnClickListener) {
+        explanationButton?.apply {
+            if (explanationButtonText != null && explanationButtonText.isNotEmpty()) {
+                text = explanationButtonText
+                visibility = View.VISIBLE
+                setOnClickListener(clickListener)
+            } else {
+                text = ""
+                visibility = View.GONE
+                setOnClickListener(null)
+            }
+        }
+    }
+
+    fun setExplanationButton(@StringRes explanationButtonTextId: Int, clickListener: View.OnClickListener) {
+        setExplanationButton(getString(explanationButtonTextId), clickListener)
+    }
+
    override fun onBindDialogView(view: View) {
        super.onBindDialogView(view)

@@ -128,6 +151,8 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
        textUnitView?.visibility = View.GONE
        textExplanationView = view.findViewById(R.id.explanation_text)
        textExplanationView?.visibility = View.GONE
+        explanationButton = view.findViewById(R.id.explanation_button)
+        explanationButton?.visibility = View.GONE
        switchElementView = view.findViewById(R.id.switch_element)
        switchElementView?.visibility = View.GONE
    }
--- a/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt
@@ -73,7 +73,6 @@ object TimeoutHelper {
                                triggerTime,
                                getLockPendingIntent(context)
                            )
-                            // TODO explain why exact alarm is needed for timeout
                        } else {
                            alarmManager.setExact(
                                AlarmManager.RTC,
--- a/app/src/main/res/layout/fragment_browser_install.xml
+++ b/app/src/main/res/layout/fragment_browser_install.xml
@@ -35,6 +35,6 @@
 		android:layout_margin="@dimen/button_margin"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="center_horizontal"
-		android:text="@string/file_browser" />
+		android:text="@string/file_browser"
+		style="@style/Widget.AppCompat.Button.Small"/>
 </LinearLayout>
--- a/app/src/main/res/layout/pref_dialog_duration.xml
+++ b/app/src/main/res/layout/pref_dialog_duration.xml
@@ -17,14 +17,16 @@
  You should have received a copy of the GNU General Public License
  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:id="@+id/edit"
 		android:orientation="vertical"
 		android:layout_width="match_parent"
-	android:layout_height="match_parent"
+		android:layout_height="wrap_content"
 		android:importantForAutofill="noExcludeDescendants"
 		tools:targetApi="o">
 		<androidx.appcompat.widget.AppCompatTextView
@@ -32,7 +34,11 @@
 			android:layout_height="wrap_content"
 			android:layout_width="0dp"
 			android:gravity="center"
-        android:layout_marginBottom="8dp"
+			android:layout_marginStart="20dp"
+			android:layout_marginLeft="20dp"
+			android:layout_marginEnd="20dp"
+			android:layout_marginRight="20dp"
+			android:layout_marginTop="8dp"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
@@ -40,18 +46,33 @@
 			app:layout_constraintRight_toRightOf="parent"
 			style="@style/KeepassDXStyle.TextAppearance.SmallTitle"/>

+		<Button
+			android:id="@+id/explanation_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:layout_marginStart="20dp"
+			android:layout_marginLeft="20dp"
+			android:layout_marginEnd="20dp"
+			android:layout_marginRight="20dp"
+			tools:text="permission"
+			style="@style/Widget.AppCompat.Button.Small"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/explanation_text" />
+
 		<androidx.appcompat.widget.SwitchCompat
 			android:id="@+id/switch_element"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="@string/enable"
+			android:layout_marginTop="8dp"
 			android:layout_marginStart="20dp"
 			android:layout_marginLeft="20dp"
 			android:layout_marginEnd="20dp"
 			android:layout_marginRight="20dp"
 			app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintRight_toRightOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/explanation_text" />
+			app:layout_constraintTop_toBottomOf="@+id/explanation_button" />

 		<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
@@ -146,4 +167,5 @@
 			</LinearLayout>

 		</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+	</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -325,6 +325,8 @@
    <string name="warning_database_info_changed">The information contained in your database file has been modified outside the app.</string>
    <string name="warning_database_info_changed_options">Overwrite the external modifications by saving the database or reload it with the latest changes.</string>
    <string name="warning_database_revoked">Access to the file revoked by the file manager, close the database and reopen it from its location.</string>
+    <string name="warning_exact_alarm">You have not allowed the app to use an exact alarm. As a result, the features requiring a timer will not be done with an exact time.</string>
+    <string name="permission">Permission</string>
    <string name="version_label">Version %1$s</string>
    <string name="build_label">Build %1$s</string>
    <string name="configure_biometric">No biometric or device credential is enrolled.</string>