Encapsulate database call as inheritance

app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt

@@ -102,7 +102,7 @@ class AutofillLauncherActivity : AppCompatActivity() {
             val readOnly = database.isReadOnly
             // If database is open
             SearchHelper.checkAutoSearchInfo(this,
-                    Database.getInstance(),
+                    database,
                     searchInfo,
                     { items ->
                         // Items found

app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt

@@ -78,8 +78,6 @@ class EntryActivity : LockingActivity() {
     private var lockView: View? = null
     private var toolbar: Toolbar? = null
 
-    private var mDatabase: Database? = null
-
     private var mEntry: Entry? = null
 
     private var mIsHistory: Boolean = false
@@ -108,8 +106,7 @@ class EntryActivity : LockingActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        mDatabase = Database.getInstance()
-        mReadOnly = mDatabase!!.isReadOnly || mReadOnly
+        mReadOnly = mDatabase?.isReadOnly != false || mReadOnly
 
         mShowPassword = !PreferencesUtil.isPasswordMask(this)
 

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt

@@ -87,8 +87,6 @@ class EntryEditActivity : LockingActivity(),
         FileTooBigDialogFragment.ActionChooseListener,
         ReplaceFileDialogFragment.ActionChooseListener {
 
-    private var mDatabase: Database? = null
-
     // Refs of an entry and group in database, are not modifiable
     private var mEntry: Entry? = null
     private var mParent: Group? = null
@@ -141,9 +139,6 @@ class EntryEditActivity : LockingActivity(),
         stopService(Intent(this, ClipboardEntryNotificationService::class.java))
         stopService(Intent(this, KeyboardEntryNotificationService::class.java))
 
-        // Likely the app has been killed exit the activity
-        mDatabase = Database.getInstance()
-
         var tempEntryInfo: EntryInfo? = null
 
         // Entry is retrieve, it's an entry to update

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

@@ -101,8 +101,6 @@ class GroupActivity : LockingActivity(),
     private var addNodeButtonView: AddNodeButtonView? = null
     private var groupNameView: TextView? = null
 
-    private var mDatabase: Database? = null
-
     private var mListNodesFragment: ListNodesFragment? = null
     private var mRequestStartupSearch = true
 
@@ -123,8 +121,6 @@ class GroupActivity : LockingActivity(),
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        mDatabase = Database.getInstance()
-
         // Construct main view
         setContentView(layoutInflater.inflate(R.layout.activity_group, null))
 

app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt

@@ -65,8 +65,6 @@ class IconPickerActivity : LockingActivity() {
     private var mCustomIconsSelectionMode = false
     private var mIconsSelected: List<IconImageCustom> = ArrayList()
 
-    private var mDatabase: Database? = null
-
     private var mExternalFileHelper: ExternalFileHelper? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -74,8 +72,6 @@ class IconPickerActivity : LockingActivity() {
 
         setContentView(R.layout.activity_icon_picker)
 
-        mDatabase = Database.getInstance()
-
         toolbar = findViewById(R.id.toolbar)
         toolbar.title = " "
         setSupportActionBar(toolbar)

app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt

@@ -33,14 +33,11 @@ import com.igreenwood.loupe.Loupe
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import kotlin.math.max
 
 class ImageViewerActivity : LockingActivity() {
 
-    private var mDatabase: Database? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -61,8 +58,6 @@ class ImageViewerActivity : LockingActivity() {
                 resources.displayMetrics.heightPixels * 2
         )
 
-        mDatabase = Database.getInstance()
-
         try {
             progressView.visibility = View.VISIBLE
             intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->

app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt

@@ -45,6 +45,8 @@ abstract class LockingActivity : SpecialModeActivity() {
     private var mLockReceiver: LockReceiver? = null
     private var mExitLock: Boolean = false
 
+    protected var mDatabase: Database? = null
+
     // Force readOnly if Entry Selection mode
     protected var mReadOnly: Boolean
         get() {
@@ -86,6 +88,8 @@ abstract class LockingActivity : SpecialModeActivity() {
             registerLockReceiver(mLockReceiver)
         }
 
+        mDatabase = Database.getInstance()
+
         mExitLock = false
     }
 

app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt

@@ -38,7 +38,6 @@ import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
-import com.kunzisoft.keepass.activities.stylish.Stylish
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService