Merge branch 'release/3.4.2'

3.4.1

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: [J-Jamet] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: Kunzisoft # Replace with a single Liberapay username
+issuehunt: Kunzisoft/KeePassDX # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://www.keepassdx.com/#donation'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

CHANGELOG

@@ -1,3 +1,7 @@
+KeePassDX(3.4.2)
+ * Fix service parameter and workflow to remove notification when service is killed
+ * Fix color
+
 KeePassDX(3.4.1)
  * Fix search mode with Magikeyboard #1292
  * Fix select another entry with Magikeyboard #1293

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 31
-        versionCode = 110
-        versionName = "3.4.1"
+        versionCode = 111
+        versionName = "3.4.2"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

app/src/main/AndroidManifest.xml

@@ -158,6 +158,7 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
             android:theme="@style/Theme.Transparent"
+            android:launchMode="singleInstance"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />

app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt

@@ -205,8 +205,7 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
             }
             // New task needed because don't launch from an Activity context
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or
-                    Intent.FLAG_ACTIVITY_CLEAR_TASK or
-                    Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                    Intent.FLAG_ACTIVITY_CLEAR_TASK
             context.startActivity(intent)
         }
     }

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt

@@ -24,6 +24,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -31,6 +32,7 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.dialogs.DatabaseDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
@@ -480,25 +482,33 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
  */
 @SuppressLint("ClickableViewAccessibility")
 fun View.resetAppTimeoutWhenViewTouchedOrFocused(context: Context, databaseLoaded: Boolean?) {
-    // Log.d(DatabaseLockActivity.TAG, "View prepared to reset app timeout")
-    setOnTouchListener { _, event ->
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                // Log.d(DatabaseLockActivity.TAG, "View touched, try to reset app timeout")
-                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-                    databaseLoaded ?: false)
+    try {
+        // Log.d(DatabaseLockActivity.TAG, "View prepared to reset app timeout")
+        setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    // Log.d(DatabaseLockActivity.TAG, "View touched, try to reset app timeout")
+                    TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(
+                        context,
+                        databaseLoaded ?: false
+                    )
+                }
+            }
+            false
+        }
+        setOnFocusChangeListener { _, _ ->
+            // Log.d(DatabaseLockActivity.TAG, "View focused, try to reset app timeout")
+            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(
+                context,
+                databaseLoaded ?: false
+            )
+        }
+        if (this is ViewGroup) {
+            for (i in 0..childCount) {
+                getChildAt(i)?.resetAppTimeoutWhenViewTouchedOrFocused(context, databaseLoaded)
             }
         }
-        false
-    }
-    setOnFocusChangeListener { _, _ ->
-        // Log.d(DatabaseLockActivity.TAG, "View focused, try to reset app timeout")
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-            databaseLoaded ?: false)
-    }
-    if (this is ViewGroup) {
-        for (i in 0..childCount) {
-            getChildAt(i)?.resetAppTimeoutWhenViewTouchedOrFocused(context, databaseLoaded)
-        }
+    } catch (e: Exception) {
+        Log.e("AppTimeout", "Unable to reset app timeout", e)
     }
 }

app/src/main/java/com/kunzisoft/keepass/database/action/DatabaseTaskProvider.kt

@@ -248,7 +248,7 @@ class DatabaseTaskProvider {
     private fun bindService() {
         initServiceConnection()
         serviceConnection?.let {
-            context.bindService(intentDatabaseTask, it, BIND_AUTO_CREATE or BIND_NOT_FOREGROUND or BIND_ABOVE_CLIENT)
+            context.bindService(intentDatabaseTask, it, BIND_AUTO_CREATE or BIND_IMPORTANT or BIND_ABOVE_CLIENT)
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt

@@ -27,6 +27,7 @@ import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
+import androidx.core.app.ServiceCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Attachment
@@ -36,7 +37,10 @@ import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import com.kunzisoft.keepass.utils.UriUtil
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 
@@ -275,7 +279,7 @@ class AttachmentFileNotificationService: LockNotificationService() {
             AttachmentState.COMPLETE,
             AttachmentState.CANCELED,
             AttachmentState.ERROR -> {
-                stopForeground(false)
+                ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_DETACH)
                 notificationManager?.notify(attachmentNotification.notificationId, builder.build())
             } else -> {
                 startForeground(attachmentNotification.notificationId, builder.build())

app/src/main/java/com/kunzisoft/keepass/services/LockNotificationService.kt

@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.services
 
 import android.content.Intent
+import androidx.core.app.ServiceCompat
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.LockReceiver
 import com.kunzisoft.keepass.utils.registerLockReceiver
@@ -33,6 +34,7 @@ abstract class LockNotificationService : NotificationService() {
 
     protected open fun actionOnLock() {
         // Stop the service in all cases
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         stopSelf()
     }
 

app/src/main/res/layout/activity_key_generator.xml

@@ -51,6 +51,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/validate"
         android:src="@drawable/ic_check_white_24dp"
+        android:tint="?attr/colorOnAccentColor"
         app:fabSize="mini"
         app:layout_constraintTop_toTopOf="@+id/toolbar"
         app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/values-v23/styles.xml

@@ -23,7 +23,7 @@
         <item name="android:windowLightStatusBar">false</item>
     </style>
     <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light.WhiteBar.v21" >
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/white</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 

app/src/main/res/values-v27/styles.xml

@@ -19,7 +19,11 @@
 -->
 <resources>
     <style name="KeepassDXStyle.Light.v27" parent="KeepassDXStyle.Light.v23" >
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:navigationBarColor">@color/white_dark</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
+    <style name="KeepassDXStyle.Night.v27" parent="KeepassDXStyle.Night.v23" >
+        <item name="android:navigationBarColor">@color/grey_dark</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
 </resources>

fastlane/Fastfile

@@ -43,6 +43,10 @@ platform :android do
       apk: "./app/build/outputs/apk/free/release/app-free-release.apk",
       validate_only: "false",
     )
+    gradle(
+      task: 'clean'
+    )
+    sh("git", "checkout", ".")
   end
 
 end

fastlane/metadata/android/en-US/changelogs/111.txt

@@ -0,0 +1,2 @@
+ * Fix service parameter and workflow to remove notification when service is killed
+ * Fix color

fastlane/metadata/android/fr-FR/changelogs/111.txt

@@ -0,0 +1,2 @@
+ * Correction du paramètre de service et du flux de travail pour supprimer la notification lorsque le service est tué
+ * Correction de couleur