Hint functionality for user password

app/src/main/java/com/andryoga/safebox/data/db/dao/UserDetailsDao.kt

@@ -13,4 +13,7 @@ interface UserDetailsDao {
 
     @Query("select * from user_details limit 1")
     suspend fun getUserDetails(): UserDetailsEntity
+
+    @Query("select hint from user_details")
+    suspend fun getHint(): String
 }

app/src/main/java/com/andryoga/safebox/data/db/entity/UserDetailsEntity.kt

@@ -9,7 +9,7 @@ data class UserDetailsEntity(
     @PrimaryKey(autoGenerate = true)
     val key: Int,
     val password: String,
-    val hint: String,
+    val hint: String?,
     val creationDate: Date,
     val updateDate: Date
 ) {

app/src/main/java/com/andryoga/safebox/data/db/secureDao/UserDetailsDaoSecure.kt

@@ -3,20 +3,29 @@ package com.andryoga.safebox.data.db.secureDao
 import com.andryoga.safebox.data.db.dao.UserDetailsDao
 import com.andryoga.safebox.data.db.entity.UserDetailsEntity
 import com.andryoga.safebox.security.interfaces.HashingUtils
+import com.andryoga.safebox.security.interfaces.SymmetricKeyUtils
 import javax.inject.Inject
 
 class UserDetailsDaoSecure @Inject constructor(
     private val userDetailsDao: UserDetailsDao,
-    private val hashingUtils: HashingUtils
+    private val hashingUtils: HashingUtils,
+    private val symmetricKeyUtils: SymmetricKeyUtils
 ) : UserDetailsDao {
     override suspend fun insertUserDetailsData(userDetailsEntity: UserDetailsEntity) {
-        userDetailsDao.insertUserDetailsData(hash(userDetailsEntity))
+        var entity = hash(userDetailsEntity)
+        entity = encrypt(entity)
+        userDetailsDao.insertUserDetailsData(entity)
     }
 
     override suspend fun getUserDetails(): UserDetailsEntity {
         return userDetailsDao.getUserDetails()
     }
 
+    override suspend fun getHint(): String {
+        val userDetailsEntity = getUserDetails()
+        return symmetricKeyUtils.decrypt(userDetailsEntity.hint!!)
+    }
+
     suspend fun checkPassword(password: String): Boolean {
         val userDetailsEntity = getUserDetails()
         return hashingUtils.compareHash(password, userDetailsEntity.password)
@@ -33,4 +42,16 @@ class UserDetailsDaoSecure @Inject constructor(
             )
         }
     }
+
+    private fun encrypt(userDetailsEntity: UserDetailsEntity): UserDetailsEntity {
+        userDetailsEntity.let {
+            return UserDetailsEntity(
+                it.key,
+                it.password,
+                it.hint?.let { it1 -> symmetricKeyUtils.encrypt(it1) },
+                it.creationDate,
+                it.updateDate
+            )
+        }
+    }
 }

app/src/main/java/com/andryoga/safebox/data/repository/UserDetailsRepositoryImpl.kt

@@ -19,4 +19,8 @@ class UserDetailsRepositoryImpl @Inject constructor(
     override suspend fun checkPassword(password: String): Boolean {
         return userDetailsDaoSecure.checkPassword(password)
     }
+
+    override suspend fun getHint(): String {
+        return userDetailsDaoSecure.getHint()
+    }
 }

app/src/main/java/com/andryoga/safebox/data/repository/interfaces/UserDetailsRepository.kt

@@ -3,4 +3,5 @@ package com.andryoga.safebox.data.repository.interfaces
 interface UserDetailsRepository {
     suspend fun insertUserDetailsData(password: String, hint: String)
     suspend fun checkPassword(password: String): Boolean
+    suspend fun getHint(): String
 }

app/src/main/java/com/andryoga/safebox/ui/common/Utils.kt

@@ -34,4 +34,12 @@ object Utils {
             imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
         }
     }
+
+    fun switchText(view: TextView, originalText: String, changeToText: String) {
+        if (view.text == originalText) {
+            view.text = changeToText
+        } else {
+            view.text = originalText
+        }
+    }
 }

app/src/main/java/com/andryoga/safebox/ui/view/chooseMasterPswrd/ChooseMasterPswrdViewModel.kt

@@ -28,6 +28,7 @@ class ChooseMasterPswrdViewModel @Inject constructor(
 
     val pswrd = MutableLiveData<String>("")
     val confirmPswrd = MutableLiveData<String>("")
+    val hint = MutableLiveData<String>("")
 
     val pswrdValidationFailures: LiveData<List<PasswordValidationFailureCode>> =
         Transformations.map(pswrd) { currPswrd ->
@@ -98,7 +99,7 @@ class ChooseMasterPswrdViewModel @Inject constructor(
     fun onSaveClick() {
         Timber.i("save password clicked")
         viewModelScope.launch {
-            userDetailsRepository.insertUserDetailsData(pswrd.value!!, "ADD HINT IN UI")
+            userDetailsRepository.insertUserDetailsData(pswrd.value!!, hint.value!!)
             encryptedPreferenceProvider.upsertBooleanPref(IS_SIGN_UP_REQUIRED, false)
             Timber.i("Added pswrd in db")
             _navigateToHome.value = true

app/src/main/java/com/andryoga/safebox/ui/view/login/LoginFragment.kt

@@ -11,6 +11,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.andryoga.safebox.R
 import com.andryoga.safebox.databinding.LoginFragmentBinding
+import com.andryoga.safebox.ui.common.Utils
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
@@ -44,6 +45,12 @@ class LoginFragment : Fragment() {
 
         setupObservers()
 
+        binding.ShowHintText.setOnClickListener {
+
+            Utils.switchText(binding.ShowHintText, getString(R.string.show_hint), getString(R.string.hide_hint))
+            Utils.switchVisibility(binding.displayHintText, binding.hintDivider)
+        }
+
         return binding.root
     }
 

app/src/main/java/com/andryoga/safebox/ui/view/login/LoginViewModel.kt

@@ -21,6 +21,13 @@ class LoginViewModel @Inject constructor(
         encryptedPreferenceProvider.getBooleanPref(IS_SIGN_UP_REQUIRED, true)
 
     val pswrd = MutableLiveData("Qwerty@@135")
+    val hint = MutableLiveData("")
+
+    init {
+        viewModelScope.launch {
+            hint.postValue(userDetailsRepository.getHint())
+        }
+    }
 
     private val _isWrongPswrdEntered = MutableLiveData<Boolean>()
     val isWrongPswrdEntered: LiveData<Boolean> = _isWrongPswrdEntered

app/src/main/res/layout/choose_master_pswrd_fragment.xml

@@ -72,6 +72,27 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/hint"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/confirm_pswrd">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/hint_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/add_hint"
+                android:text="@={viewModel.hint}">
+
+            </com.google.android.material.textfield.TextInputEditText>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
         <TextView
             android:id="@+id/length_validation"
             style="@style/validationTextViewStyle"
@@ -80,7 +101,7 @@
             android:layout_marginTop="16dp"
             android:text="@string/length_validation_text"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/confirm_pswrd"
+            app:layout_constraintTop_toBottomOf="@+id/hint"
             tools:drawableLeftCompat="@drawable/ic_check_24" />
 
         <TextView

app/src/main/res/layout/login_fragment.xml

@@ -50,6 +50,40 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="8dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/display_hint_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{viewModel.hint}"
+                        android:textSize="16sp"
+                        android:visibility="invisible"/>
+
+                    <View
+                        android:id="@+id/hint_divider"
+                        android:layout_width="match_parent"
+                        android:layout_height="0.5dp"
+                        android:background="@color/colorPrimary"
+                        android:visibility="invisible"/>
+
+                    <TextView
+                        android:id="@+id/Show_hint_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end"
+                        android:text="@string/show_hint"
+                        android:textColor="@color/colorPrimary"/>
+
+                </LinearLayout>
+
+
                 <Button
                     android:id="@+id/save_btn"
                     android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -48,6 +48,9 @@
     <string name="bank_account">Bank Account</string>
     <string name="bank_card">Bank Card</string>
     <string name="secure_note">Secure Note</string>
+    <string name="add_hint">Add hint</string>
+    <string name="show_hint">Show hint</string>
+    <string name="hide_hint">Hide hint</string>
     <string name="title">Title <font color='#FF0000'>̽</font></string>
     <string name="url">URL</string>
     <string name="user_id">User Id <font color='#FF0000'>̽</font></string>