Merge branch 'release/2.5beta27'

Kunzisoft · Mar 7, 2020 · b087733 · b087733
2 parents ab27299 + 675efe2
commit b087733
Show file tree

Hide file tree

Showing 81 changed files with 1,995 additions and 1,412 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -20,9 +20,6 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
 ** Keepass Database **
  - Created with: [e.g Windows KeePass 2.42]
  - Version: [e.g. 2]

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,12 @@
+KeepassDX (2.5beta27)
+ * New setting to hide broken links
+ * Show URL when title is empty
+ * Setting to open search field at database opening
+ * Fix settings for database locations
+ * Fix error message when database file not writable
+ * Fix appearance refresh settings
+ * Sort optimization
+
 KeepassDX (2.5.0.0beta26)
  * Download attachments
  * Change file size string format

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode = 26
-        versionName = "2.5.0.0beta26"
+        versionCode = 27
+        versionName = "2.5beta27"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,10 +8,15 @@
       android:normalScreens="true"
       android:largeScreens="true"
       android:anyDensity="true" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission
+        android:name="android.permission.VIBRATE"/>
+    <uses-permission
+        android:maxSdkVersion="18"
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:label="@string/app_name"
@@ -128,7 +133,7 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.AboutActivity"
             android:launchMode="singleTask"
-            android:label="@string/menu_about" />
+            android:label="@string/about" />
         <activity android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
         <activity android:name="com.kunzisoft.keepass.autofill.AutofillLauncherActivity"
             android:configChanges="keyboardHidden" />

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
@@ -21,15 +21,15 @@ package com.kunzisoft.keepass.activities
 
 import android.content.pm.PackageManager.NameNotFoundException
 import android.os.Bundle
-import androidx.appcompat.widget.Toolbar
+import android.text.method.LinkMovementMethod
 import android.util.Log
 import android.view.MenuItem
 import android.widget.TextView
-
+import androidx.appcompat.widget.Toolbar
+import androidx.core.text.HtmlCompat
 import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-
 import org.joda.time.DateTime
 
 class AboutActivity : StylishActivity() {
@@ -40,7 +40,7 @@ class AboutActivity : StylishActivity() {
         setContentView(R.layout.activity_about)
 
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
-        toolbar.title = getString(R.string.menu_about)
+        toolbar.title = getString(R.string.about)
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -64,9 +64,17 @@ class AboutActivity : StylishActivity() {
         val buildTextView = findViewById<TextView>(R.id.activity_about_build)
         buildTextView.text = build
 
+        findViewById<TextView>(R.id.activity_about_licence_text).apply {
+            movementMethod = LinkMovementMethod.getInstance()
+            text = HtmlCompat.fromHtml(getString(R.string.html_about_licence, DateTime().year),
+                    HtmlCompat.FROM_HTML_MODE_LEGACY)
+        }
 
-        val disclaimerText = findViewById<TextView>(R.id.disclaimer)
-        disclaimerText.text = getString(R.string.disclaimer_formal, DateTime().year)
+        findViewById<TextView>(R.id.activity_about_contribution_text).apply {
+            movementMethod = LinkMovementMethod.getInstance()
+            text = HtmlCompat.fromHtml(getString(R.string.html_about_contribution),
+                    HtmlCompat.FROM_HTML_MODE_LEGACY)
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -34,6 +34,7 @@ import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
@@ -60,11 +61,13 @@ import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.utils.createDocument
 import com.kunzisoft.keepass.utils.onCreateDocumentResult
 import com.kunzisoft.keepass.view.EntryContentsView
+import com.kunzisoft.keepass.view.showActionError
 import java.util.*
 import kotlin.collections.HashMap
 
 class EntryActivity : LockingActivity() {
 
+    private var coordinatorLayout: CoordinatorLayout? = null
     private var collapsingToolbarLayout: CollapsingToolbarLayout? = null
     private var titleIconView: ImageView? = null
     private var historyView: View? = null
@@ -114,6 +117,7 @@ class EntryActivity : LockingActivity() {
         invalidateOptionsMenu()
 
         // Get views
+        coordinatorLayout = findViewById(R.id.toolbar_coordinator)
         collapsingToolbarLayout = findViewById(R.id.toolbar_layout)
         titleIconView = findViewById(R.id.entry_icon)
         historyView = findViewById(R.id.history_container)
@@ -137,7 +141,7 @@ class EntryActivity : LockingActivity() {
                         finish()
                 }
             }
-            // TODO Visual error for entry history
+            coordinatorLayout?.showActionError(result)
         }
     }
 

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -29,13 +29,15 @@ import android.view.View
 import android.widget.ScrollView
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
 import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
@@ -49,7 +51,7 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.view.EntryEditContentsView
-import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.showActionError
 import java.util.*
 
 class EntryEditActivity : LockingActivity(),
@@ -188,15 +190,7 @@ class EntryEditActivity : LockingActivity(),
                         finish()
                 }
             }
-
-            // Show error
-            if (!result.isSuccess) {
-                result.message?.let { resultMessage ->
-                    Snackbar.make(coordinatorLayout!!,
-                            resultMessage,
-                            Snackbar.LENGTH_LONG).asError().show()
-                }
-            }
+            coordinatorLayout?.showActionError(result)
         }
     }
 

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -52,6 +52,7 @@ import com.kunzisoft.keepass.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.asError
 import kotlinx.android.synthetic.main.activity_file_selection.*
@@ -274,12 +275,28 @@ class FileDatabaseSelectActivity : StylishActivity(),
         updateExternalStorageWarning()
 
         // Construct adapter with listeners
-        mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
-            databaseFileHistoryList?.let {
-                mAdapterDatabaseHistory?.addDatabaseFileHistoryList(it)
-                updateFileListVisibility()
-                mAdapterDatabaseHistory?.notifyDataSetChanged()
+        if (PreferencesUtil.showRecentFiles(this)) {
+            mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
+                databaseFileHistoryList?.let { historyList ->
+                    val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(this@FileDatabaseSelectActivity)
+                    mAdapterDatabaseHistory?.addDatabaseFileHistoryList(
+                            // Show only uri accessible
+                            historyList.filter {
+                                if (hideBrokenLocations) {
+                                    UriUtil.parse(it.databaseUri)?.let { historyUri ->
+                                        UriUtil.isUriAccessible(contentResolver, historyUri)
+                                    } ?: false
+                                } else
+                                    true
+                            })
+                    mAdapterDatabaseHistory?.notifyDataSetChanged()
+                    updateFileListVisibility()
+                }
             }
+        } else {
+            mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+            mAdapterDatabaseHistory?.notifyDataSetChanged()
+            updateFileListVisibility()
         }
 
         // Register progress task

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -76,6 +76,7 @@ import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.view.AddNodeButtonView
 import com.kunzisoft.keepass.view.ToolbarAction
 import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.showActionError
 
 class GroupActivity : LockingActivity(),
         GroupEditDialogFragment.EditGroupListener,
@@ -101,6 +102,7 @@ class GroupActivity : LockingActivity(),
 
     private var mListNodesFragment: ListNodesFragment? = null
     private var mCurrentGroupIsASearch: Boolean = false
+    private var mRequestStartupSearch = true
 
     // Nodes
     private var mRootGroup: Group? = null
@@ -141,6 +143,8 @@ class GroupActivity : LockingActivity(),
 
         // Retrieve elements after an orientation change
         if (savedInstanceState != null) {
+            if (savedInstanceState.containsKey(REQUEST_STARTUP_SEARCH_KEY))
+                mRequestStartupSearch = savedInstanceState.getBoolean(REQUEST_STARTUP_SEARCH_KEY)
             if (savedInstanceState.containsKey(OLD_GROUP_TO_UPDATE_KEY))
                 mOldGroupToUpdate = savedInstanceState.getParcelable(OLD_GROUP_TO_UPDATE_KEY)
         }
@@ -251,15 +255,7 @@ class GroupActivity : LockingActivity(),
                     }
                 }
 
-                if (!result.isSuccess) {
-                    coordinatorLayout?.let { coordinatorLayout ->
-                        result.exception?.errorId?.let { errorId ->
-                            Snackbar.make(coordinatorLayout, errorId, Snackbar.LENGTH_LONG).asError().show()
-                        } ?: result.message?.let { message ->
-                            Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG).asError().show()
-                        }
-                    }
-                }
+                coordinatorLayout?.showActionError(result)
 
                 finishNodeAction()
 
@@ -339,6 +335,7 @@ class GroupActivity : LockingActivity(),
         mOldGroupToUpdate?.let {
             outState.putParcelable(OLD_GROUP_TO_UPDATE_KEY, it)
         }
+        outState.putBoolean(REQUEST_STARTUP_SEARCH_KEY, mRequestStartupSearch)
         super.onSaveInstanceState(outState)
     }
 
@@ -449,7 +446,7 @@ class GroupActivity : LockingActivity(),
     private fun refreshNumberOfChildren() {
         numberChildrenView?.apply {
             if (PreferencesUtil.showNumberEntries(context)) {
-                text = mCurrentGroup?.getChildEntries(*Group.ChildFilter.getDefaults(context))?.size?.toString() ?: ""
+                text = mCurrentGroup?.getNumberOfChildEntries(*Group.ChildFilter.getDefaults(context))?.toString() ?: ""
                 visibility = View.VISIBLE
             } else {
                 visibility = View.GONE
@@ -690,6 +687,13 @@ class GroupActivity : LockingActivity(),
                     }
                 })
             }
+            // Expand the search view if defined in settings
+            if (mRequestStartupSearch
+                    && PreferencesUtil.automaticallyFocusSearch(this@GroupActivity)) {
+                // To request search only one time
+                mRequestStartupSearch = false
+                it.expandActionView()
+            }
         }
 
         super.onCreateOptionsMenu(menu)
@@ -942,6 +946,7 @@ class GroupActivity : LockingActivity(),
 
         private val TAG = GroupActivity::class.java.name
 
+        private const val REQUEST_STARTUP_SEARCH_KEY = "REQUEST_STARTUP_SEARCH_KEY"
         private const val GROUP_ID_KEY = "GROUP_ID_KEY"
         private const val LIST_NODES_FRAGMENT_TAG = "LIST_NODES_FRAGMENT_TAG"
         private const val SEARCH_FRAGMENT_TAG = "SEARCH_FRAGMENT_TAG"