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

fix: Upgrade to API 35

Browse Source
This commit is contained in:
J-Jamet
2025-09-09 11:45:30 +02:00
parent 30dd7c567c
commit e8ec27dc38
16 changed files with 42 additions and 22 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 {
namespace 'com.kunzisoft.keepass'
compileSdkVersion 34
compileSdkVersion 36
defaultConfig {
applicationId "com.kunzisoft.keepass"
minSdkVersion 19
targetSdkVersion 34
targetSdkVersion 35
versionCode = 139
versionName = "4.1.7"
multiDexEnabled true

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

@@ -58,7 +58,7 @@ class AboutActivity : StylishActivity() {
var version: String
var build: String
try {
version = packageManager.getPackageInfoCompat(packageName).versionName
version = packageManager.getPackageInfoCompat(packageName).versionName ?: ""
build = BuildConfig.BUILD_VERSION
} catch (e: NameNotFoundException) {
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

@@ -1373,7 +1373,8 @@ class GroupActivity : DatabaseLockActivity(),
}
else -> {
// 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.os.Build
import android.os.IBinder
import android.util.Log
import android.util.TypedValue
import android.widget.Toast
import androidx.core.app.NotificationCompat
@@ -156,11 +157,21 @@ abstract class NotificationService : Service() {
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 = null
notificationManager?.cancel(notificationId)
}
override fun onDestroy() {
cancelNotification()
super.onDestroy()
}

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

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

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

@@ -19,11 +19,12 @@
-->
<androidx.constraintlayout.widget.ConstraintLayout
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:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:filterTouchesWhenObscured="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
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
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:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:filterTouchesWhenObscured="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
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:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
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"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
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
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_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_alignParentBottom="true"
android:paddingTop="4dp"
android:paddingBottom="8dp"

4
crypto/build.gradle
View File

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

4
database/build.gradle
View File

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

4
icon-pack/build.gradle
View File

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

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

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

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

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