Refactoring education

app/src/main/java/com/kunzisoft/keepass/education/Education.kt

@@ -35,12 +35,12 @@ open class Education(val activity: Activity) {
      * Utility method to save preference after an education action
      */
     protected fun checkAndPerformedEducation(isEducationAlreadyPerformed: Boolean,
-                                   tapTarget: TapTarget,
+                                             tapTarget: TapTarget,
-                                   listener: TapTargetView.Listener,
+                                             listener: TapTargetView.Listener,
-                                   saveEducationStringId: Int): Boolean {
+                                             saveEducationStringId: Int): Boolean {
         var doEducation = false
         if (isEducationScreensEnabled()) {
-            if (isEducationAlreadyPerformed) {
+            if (!isEducationAlreadyPerformed) {
                 try {
                     TapTargetView.showFor(activity, tapTarget, listener)
                     saveEducationPreference(activity, saveEducationStringId)
@@ -117,6 +117,29 @@ open class Education(val activity: Activity) {
                 R.string.education_add_attachment_key,
                 R.string.education_setup_OTP_key)
 
+        fun putPropertiesInEducationPreferences(context: Context,
+                                                editor: SharedPreferences.Editor,
+                                                name: String,
+                                                value: String) {
+            when (name) {
+                context.getString(R.string.education_create_db_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_select_db_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_unlock_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_read_only_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_biometric_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_search_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_new_node_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_sort_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_lock_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_copy_username_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_entry_edit_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_password_generator_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_entry_new_field_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_add_attachment_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_setup_OTP_key) -> editor.putBoolean(name, value.toBoolean())
+            }
+        }
+
         /**
          * Get preferences bundle for education
          */

app/src/main/java/com/kunzisoft/keepass/education/EntryActivityEducation.kt

@@ -32,8 +32,7 @@ class EntryActivityEducation(activity: Activity)
     fun checkAndPerformedEntryCopyEducation(educationView: View,
                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(
+        return checkAndPerformedEducation(isEducationCopyUsernamePerformed(activity),
-                !isEducationCopyUsernamePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_field_copy_title),
                         activity.getString(R.string.education_field_copy_summary))
@@ -64,8 +63,7 @@ class EntryActivityEducation(activity: Activity)
     fun checkAndPerformedEntryEditEducation(educationView: View,
                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(
+        return checkAndPerformedEducation(isEducationEntryEditPerformed(activity),
-                !isEducationEntryEditPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_entry_edit_title),
                         activity.getString(R.string.education_entry_edit_summary))

app/src/main/java/com/kunzisoft/keepass/education/EntryEditActivityEducation.kt

@@ -35,7 +35,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedGeneratePasswordEducation(educationView: View,
                                                    onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                    onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationPasswordGeneratorPerformed(activity),
+        return checkAndPerformedEducation(isEducationPasswordGeneratorPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_generate_password_title),
                         activity.getString(R.string.education_generate_password_summary))
@@ -66,7 +66,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedEntryNewFieldEducation(educationView: View,
                                                 onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                 onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationEntryNewFieldPerformed(activity),
+        return checkAndPerformedEducation(isEducationEntryNewFieldPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_entry_new_field_title),
                         activity.getString(R.string.education_entry_new_field_summary))
@@ -97,7 +97,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedAttachmentEducation(educationView: View,
                                              onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                              onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationAddAttachmentPerformed(activity),
+        return checkAndPerformedEducation(isEducationAddAttachmentPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_add_attachment_title),
                         activity.getString(R.string.education_add_attachment_summary))
@@ -128,7 +128,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedSetUpOTPEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSetupOTPPerformed(activity),
+        return checkAndPerformedEducation(isEducationSetupOTPPerformed(activity),
                 TapTarget.forView(educationView,
                                 activity.getString(R.string.education_setup_OTP_title),
                                 activity.getString(R.string.education_setup_OTP_summary))

app/src/main/java/com/kunzisoft/keepass/education/FileDatabaseSelectActivityEducation.kt

@@ -39,7 +39,7 @@ class FileDatabaseSelectActivityEducation(activity: Activity)
                                                  onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
 
         // Try to open the creation base education
-        return checkAndPerformedEducation(!isEducationCreateDatabasePerformed(activity),
+        return checkAndPerformedEducation(isEducationCreateDatabasePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_create_database_title),
                         activity.getString(R.string.education_create_database_summary))
@@ -71,7 +71,7 @@ class FileDatabaseSelectActivityEducation(activity: Activity)
     fun checkAndPerformedSelectDatabaseEducation(educationView: View,
                                                  onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                  onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSelectDatabasePerformed(activity),
+        return checkAndPerformedEducation(isEducationSelectDatabasePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_select_database_title),
                         activity.getString(R.string.education_select_database_summary))

app/src/main/java/com/kunzisoft/keepass/education/GroupActivityEducation.kt

@@ -31,7 +31,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedAddNodeButtonEducation(educationView: View,
                                                 onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                 onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationNewNodePerformed(activity),
+        return checkAndPerformedEducation(isEducationNewNodePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_new_node_title),
                         activity.getString(R.string.education_new_node_summary))
@@ -58,7 +58,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedSearchMenuEducation(educationView: View,
                                              onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                              onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSearchPerformed(activity),
+        return checkAndPerformedEducation(isEducationSearchPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_search_title),
                         activity.getString(R.string.education_search_summary))
@@ -85,7 +85,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedSortMenuEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSortPerformed(activity),
+        return checkAndPerformedEducation(isEducationSortPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_sort_title),
                         activity.getString(R.string.education_sort_summary))
@@ -112,7 +112,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedLockMenuEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationLockPerformed(activity),
+        return checkAndPerformedEducation(isEducationLockPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_lock_title),
                         activity.getString(R.string.education_lock_summary))

app/src/main/java/com/kunzisoft/keepass/education/PasswordActivityEducation.kt

@@ -32,7 +32,7 @@ class PasswordActivityEducation(activity: Activity)
     fun checkAndPerformedUnlockEducation(educationView: View,
                                          onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                          onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationUnlockPerformed(activity),
+        return checkAndPerformedEducation(isEducationUnlockPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_unlock_title),
                         activity.getString(R.string.education_unlock_summary))
@@ -60,7 +60,7 @@ class PasswordActivityEducation(activity: Activity)
     fun checkAndPerformedReadOnlyEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationReadOnlyPerformed(activity),
+        return checkAndPerformedEducation(isEducationReadOnlyPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_read_only_title),
                         activity.getString(R.string.education_read_only_summary))
@@ -87,7 +87,7 @@ class PasswordActivityEducation(activity: Activity)
     fun checkAndPerformedBiometricEducation(educationView: View,
                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationBiometricPerformed(activity),
+        return checkAndPerformedEducation(isEducationBiometricPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_advanced_unlock_title),
                         activity.getString(R.string.education_advanced_unlock_summary))

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

@@ -671,23 +671,7 @@ object PreferencesUtil {
 
         putPropertiesInPreferences(properties,
                 Education.getEducationSharedPreferences(context)) { editor, name, value ->
-            when (name) {
+            Education.putPropertiesInEducationPreferences(context, editor, name, value)
-                context.getString(R.string.education_create_db_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_select_db_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_unlock_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_read_only_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_biometric_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_search_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_new_node_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_sort_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_lock_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_copy_username_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_entry_edit_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_password_generator_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_entry_new_field_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_add_attachment_key) -> editor.putBoolean(name, value.toBoolean())
-                context.getString(R.string.education_setup_OTP_key) -> editor.putBoolean(name, value.toBoolean())
-            }
         }
     }
 }