rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/Passkeys

Browse Source
This commit is contained in:
J-Jamet
2025-09-09 11:51:41 +02:00
parent e562694606 e8ec27dc38
commit ef98e8a2db
17 changed files with 143 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -5,12 +5,12 @@ apply plugin: 'kotlin-kapt'
android { android {
namespace 'com.kunzisoft.keepass' namespace 'com.kunzisoft.keepass'
compileSdkVersion 34 compileSdkVersion 36
defaultConfig { defaultConfig {
applicationId "com.kunzisoft.keepass" applicationId "com.kunzisoft.keepass"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 35
versionCode = 139 versionCode = 139
versionName = "4.1.7" versionName = "4.1.7"
multiDexEnabled true multiDexEnabled true

2
app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
View File

@@ -57,7 +57,7 @@ class AboutActivity : StylishActivity() {
var version: String var version: String
var build: String var build: String
try { try {
version = packageManager.getPackageInfoCompat(packageName).versionName version = packageManager.getPackageInfoCompat(packageName).versionName ?: ""
build = BuildConfig.BUILD_VERSION build = BuildConfig.BUILD_VERSION
} catch (e: NameNotFoundException) { } catch (e: NameNotFoundException) {
Log.w(javaClass.simpleName, "Unable to get the app or the build version", e) Log.w(javaClass.simpleName, "Unable to get the app or the build version", e)

3
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -1457,7 +1457,8 @@ class GroupActivity : DatabaseLockActivity(),
} }
else -> { else -> {
// Load the previous group // Load the previous group
loadMainGroup(mPreviousGroupsIds.removeLast()) loadMainGroup(mPreviousGroupsIds
.removeAt(mPreviousGroupsIds.lastIndex))
} }
} }
} }

13
app/src/main/java/com/kunzisoft/keepass/services/NotificationService.kt
View File

@@ -12,6 +12,7 @@ import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE
import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
import android.os.Build import android.os.Build
import android.os.IBinder import android.os.IBinder
import android.util.Log
import android.util.TypedValue import android.util.TypedValue
import android.widget.Toast import android.widget.Toast
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
@@ -156,11 +157,21 @@ abstract class NotificationService : Service() {
mReset = true mReset = true
} }
override fun onDestroy() { override fun onTimeout(startId: Int, fgsType: Int) {
super.onTimeout(startId, fgsType)
Log.e(javaClass::class.simpleName, "The service took too long to execute")
cancelNotification()
stopSelf()
}
protected fun cancelNotification() {
mTimerJob?.cancel() mTimerJob?.cancel()
mTimerJob = null mTimerJob = null
notificationManager?.cancel(notificationId) notificationManager?.cancel(notificationId)
}
override fun onDestroy() {
cancelNotification()
super.onDestroy() super.onDestroy()
} }

3
app/src/main/res/layout/activity_about.xml
View File

@@ -19,10 +19,11 @@
--> -->
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"> android:orientation="vertical">
<include <include

1
app/src/main/res/layout/activity_file_selection.xml
View File

@@ -21,6 +21,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true"

5
app/src/main/res/layout/activity_icon_picker.xml
View File

@@ -19,11 +19,12 @@
--> -->
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:id="@+id/icon_picker_container" android:id="@+id/icon_picker_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true">
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/icon_picker_coordinator" android:id="@+id/icon_picker_coordinator"

5
app/src/main/res/layout/activity_key_generator.xml
View File

@@ -19,11 +19,12 @@
--> -->
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:id="@+id/key_generator_container" android:id="@+id/key_generator_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true">
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/key_generator_coordinator" android:id="@+id/key_generator_coordinator"

1
app/src/main/res/layout/activity_main_credential.xml
View File

@@ -21,6 +21,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true"

1
app/src/main/res/layout/activity_toolbar.xml
View File

@@ -19,6 +19,7 @@
--> -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true"

6
app/src/main/res/layout/keyboard_container.xml
View File

@@ -17,10 +17,12 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>. along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"

30
app/src/main/res/xml/dataset_service.xml
View File

@@ -43,7 +43,7 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.android.chrome" android:name="com.android.chrome"
android:maxLongVersionCode="10000000000"/> android:maxLongVersionCode="711900039" />
<compatibility-package <compatibility-package
android:name="com.android.htmlviewer" android:name="com.android.htmlviewer"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
@@ -55,7 +55,7 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.brave.browser" android:name="com.brave.browser"
android:maxLongVersionCode="10000000000"/> android:maxLongVersionCode="427912623" />
<compatibility-package <compatibility-package
android:name="com.brave.browser_beta" android:name="com.brave.browser_beta"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
@@ -70,13 +70,7 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.chrome.beta" android:name="com.chrome.beta"
android:maxLongVersionCode="10000000000"/> android:maxLongVersionCode="711900039" />
<compatibility-package
android:name="com.chrome.canary"
android:maxLongVersionCode="10000000000"/>
<compatibility-package
android:name="com.chrome.dev"
android:maxLongVersionCode="10000000000"/>
<compatibility-package <compatibility-package
android:name="com.cookiegames.smartcookie" android:name="com.cookiegames.smartcookie"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
@@ -107,6 +101,9 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
<compatibility-package <compatibility-package
android:name="com.kiwibrowser.browser.dev" android:name="com.kiwibrowser.browser.dev"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package
android:name="com.ktllq.play"
android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.lemurbrowser.exts" android:name="com.lemurbrowser.exts"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
@@ -188,12 +185,18 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
<compatibility-package <compatibility-package
android:name="com.yandex.browser" android:name="com.yandex.browser"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package
android:name="com.yjllq.chrome.beta"
android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.yjllq.internet" android:name="com.yjllq.internet"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.yjllq.kito" android:name="com.yjllq.kito"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package
android:name="com.yjllqint.kito"
android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="com.yujian.ResideMenuDemo" android:name="com.yujian.ResideMenuDemo"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
@@ -251,9 +254,15 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
<compatibility-package <compatibility-package
android:name="org.codeaurora.swe.browser" android:name="org.codeaurora.swe.browser"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package
android:name="org.cromite.cromite"
android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="org.gnu.icecat" android:name="org.gnu.icecat"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package
android:name="org.ironfoxoss.ironfox"
android:maxLongVersionCode="10000000000" />
<compatibility-package <compatibility-package
android:name="org.mozilla.fenix" android:name="org.mozilla.fenix"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
@@ -290,7 +299,4 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
<compatibility-package <compatibility-package
android:name="org.ungoogled.chromium.stable" android:name="org.ungoogled.chromium.stable"
android:maxLongVersionCode="10000000000" /> android:maxLongVersionCode="10000000000" />
<compatibility-package
android:name="us.spotco.fennec_dos"
android:maxLongVersionCode="10000000000"/>
</autofill-service> </autofill-service>

4
crypto/build.gradle
View File

@@ -5,12 +5,12 @@ plugins {
android { android {
namespace 'com.kunzisoft.encrypt' namespace 'com.kunzisoft.encrypt'
compileSdkVersion 34 compileSdkVersion 36
ndkVersion "21.4.7075529" ndkVersion "21.4.7075529"
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 35
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

4
database/build.gradle
View File

@@ -4,11 +4,11 @@ apply plugin: 'kotlin-parcelize'
android { android {
namespace 'com.kunzisoft.keepass.database' namespace 'com.kunzisoft.keepass.database'
compileSdkVersion 34 compileSdkVersion 36
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdk 34 targetSdk 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

4
icon-pack/build.gradle
View File

@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
android { android {
namespace 'com.kunzisoft.keepass.icon' namespace 'com.kunzisoft.keepass.icon'
compileSdkVersion 34 compileSdkVersion 36
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 35
} }
compileOptions { compileOptions {

4
icon-pack/classic/build.gradle
View File

@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
android { android {
namespace 'com.kunzisoft.keepass.icon.classic' namespace 'com.kunzisoft.keepass.icon.classic'
compileSdkVersion 34 compileSdkVersion 36
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 35
} }
resourcePrefix 'classic_' resourcePrefix 'classic_'

4
icon-pack/material/build.gradle
View File

@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
android { android {
namespace 'com.kunzisoft.keepass.icon.material' namespace 'com.kunzisoft.keepass.icon.material'
compileSdkVersion 34 compileSdkVersion 36
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 35
} }
resourcePrefix 'material_' resourcePrefix 'material_'