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 small bugs

Browse Source
This commit is contained in:
J-Jamet
2022-02-12 16:01:30 +01:00
parent 8b7bb36e66
commit de2160f992
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
View File

@@ -748,13 +748,17 @@ class Database {
} }
databaseToMerge.mDatabaseKDB?.let { databaseKDBToMerge -> databaseToMerge.mDatabaseKDB?.let { databaseKDBToMerge ->
databaseMerger.merge(databaseKDBToMerge) databaseMerger.merge(databaseKDBToMerge)
if (databaseToMergeUri != null) {
this.dataModifiedSinceLastLoading = true this.dataModifiedSinceLastLoading = true
} }
}
databaseToMerge.mDatabaseKDBX?.let { databaseKDBXToMerge -> databaseToMerge.mDatabaseKDBX?.let { databaseKDBXToMerge ->
databaseMerger.merge(databaseKDBXToMerge) databaseMerger.merge(databaseKDBXToMerge)
if (databaseToMergeUri != null) {
this.dataModifiedSinceLastLoading = true this.dataModifiedSinceLastLoading = true
} }
} }
}
} else { } else {
throw IODatabaseException("Database URI is null, database cannot be merged") throw IODatabaseException("Database URI is null, database cannot be merged")
} }

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

@@ -119,7 +119,8 @@
<com.kunzisoft.keepass.view.MainCredentialView <com.kunzisoft.keepass.view.MainCredentialView
android:id="@+id/activity_password_credentials" android:id="@+id/activity_password_credentials"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:background="?android:attr/windowBackground" />
</FrameLayout> </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -12,7 +12,6 @@
android:paddingRight="12dp" android:paddingRight="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:background="?android:attr/windowBackground"
tools:targetApi="lollipop"> tools:targetApi="lollipop">
<!-- Password Input --> <!-- Password Input -->