mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-04 21:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: Error with coordinator

Browse source
This commit is contained in:
J-Jamet 2023-08-05 17:06:07 +02:00
parent eb14dadb3c
commit 8ce9757b7c
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View file

@ -124,6 +124,7 @@ class GroupActivity : DatabaseLockActivity(),
private var drawerLayout: DrawerLayout? = null
private var databaseNavView: NavigationDatabaseView? = null
private var coordinatorLayout: CoordinatorLayout? = null
private var coordinatorError: CoordinatorLayout? = null
private var lockView: View? = null
private var toolbar: Toolbar? = null
private var databaseModifiedView: ImageView? = null
@ -270,6 +271,7 @@ class GroupActivity : DatabaseLockActivity(),
drawerLayout = findViewById(R.id.drawer_layout)
databaseNavView = findViewById(R.id.database_nav_view)
coordinatorLayout = findViewById(R.id.group_coordinator)
coordinatorError = findViewById(R.id.error_coordinator)
numberChildrenView = findViewById(R.id.group_numbers)
addNodeButtonView = findViewById(R.id.add_node_button)
toolbar = findViewById(R.id.toolbar)
@ -690,7 +692,7 @@ class GroupActivity : DatabaseLockActivity(),
}
}
coordinatorLayout?.showActionErrorIfNeeded(result)
coordinatorError?.showActionErrorIfNeeded(result)
// Reload the group
loadGroup()

7
app/src/main/java/com/kunzisoft/keepass/database/helper/LocalizedHelper.kt
View file

@ -26,7 +26,7 @@ import com.kunzisoft.keepass.database.element.template.TemplateEngine
import com.kunzisoft.keepass.database.element.template.TemplateField
import com.kunzisoft.keepass.database.exception.*
fun DatabaseException.getLocalizedMessage(resources: Resources): String = parameters?.let {
fun DatabaseException.getLocalizedMessage(resources: Resources): String? =
when (this) {
is FileNotFoundDatabaseException -> resources.getString(R.string.file_not_found_content)
is CorruptedDatabaseException -> resources.getString(R.string.corrupted_file)
@ -39,7 +39,7 @@ fun DatabaseException.getLocalizedMessage(resources: Resources): String = parame
is InvalidCredentialsDatabaseException -> resources.getString(R.string.invalid_credentials)
is KDFMemoryDatabaseException -> resources.getString(R.string.error_load_database_KDF_memory)
is NoMemoryDatabaseException -> resources.getString(R.string.error_out_of_memory)
is DuplicateUuidDatabaseException -> resources.getString(R.string.invalid_db_same_uuid)
is DuplicateUuidDatabaseException -> resources.getString(R.string.invalid_db_same_uuid, parameters[0], parameters[1])
is XMLMalformedDatabaseException -> resources.getString(R.string.error_XML_malformed)
is MergeDatabaseKDBException -> resources.getString(R.string.error_unable_merge_database_kdb)
is MoveEntryDatabaseException -> resources.getString(R.string.error_move_entry_here)
@ -48,9 +48,8 @@ fun DatabaseException.getLocalizedMessage(resources: Resources): String = parame
is CopyGroupDatabaseException -> resources.getString(R.string.error_copy_group_here)
is DatabaseInputException -> resources.getString(R.string.error_load_database)
is DatabaseOutputException -> resources.getString(R.string.error_save_database)
else -> (mThrowable as? DatabaseException)?.getLocalizedMessage(resources)
else -> localizedMessage
}
} ?: resources.getString(R.string.error_load_database)
fun CompressionAlgorithm.getLocalizedName(resources: Resources): String {
return when (this) {

7
app/src/main/res/layout/activity_group.xml
View file

@ -157,6 +157,13 @@
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/error_coordinator"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/toolbar"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"/>
<include layout="@layout/view_screenshot_mode_banner" />
</androidx.constraintlayout.widget.ConstraintLayout>

7
database/src/main/java/com/kunzisoft/keepass/database/exception/DatabaseException.kt
View file

@ -27,7 +27,7 @@ import java.io.PrintWriter
abstract class DatabaseException : Exception {
var innerMessage: String? = null
var parameters: (Array<out String>)? = null
var parameters = mutableListOf<String>()
var mThrowable: Throwable? = null
constructor() : super()
@ -94,7 +94,10 @@ class NoMemoryDatabaseException(exception: Throwable) : DatabaseInputException(e
class DuplicateUuidDatabaseException(type: Type, uuid: NodeId<*>) : DatabaseInputException() {
init {
parameters = arrayOf(type.name, uuid.toString())
parameters.apply {
add(type.name)
add(uuid.toString())
}
}
}