From c7db577e2eeafb118777dfb201fa328b32e1cfc5 Mon Sep 17 00:00:00 2001 From: Yogesh Choudhary Paliyal Date: Sun, 3 Jul 2022 00:45:24 +0530 Subject: [PATCH] removed wildcard entries" --- .idea/codeStyles/Project.xml | 2 ++ .../keypass/ExampleInstrumentedTest.kt | 2 +- .../keypass/ui/nav/DashboardActivityTest.kt | 6 +++--- .../com/yogeshpaliyal/keypass/InfoModel.kt | 16 ---------------- .../keypass/data/MyAccountModel.kt | 2 +- .../keypass/service/BasicService.kt | 10 ++++++++-- .../keypass/service/MyAutoFillService.kt | 6 +++++- .../keypass/ui/addTOTP/AddTOTPViewModel.kt | 2 +- .../keypass/ui/addTOTP/ScannerActivity.kt | 2 +- .../keypass/ui/auth/AuthenticationActivity.kt | 4 +++- .../keypass/ui/backup/BackupActivity.kt | 19 +++++++++++++++++-- .../keypass/ui/home/DashboardViewModel.kt | 7 +++++-- .../keypass/ui/home/HomeFragment.kt | 2 +- .../keypass/ui/nav/BottomNavViewModel.kt | 1 - .../keypass/ui/settings/MySettingsFragment.kt | 4 ++-- .../yogeshpaliyal/keypass/ExampleUnitTest.kt | 2 +- .../common/ExampleInstrumentedTest.kt | 1 - .../com/yogeshpaliyal/common/AppDatabase.kt | 2 +- .../common/constants/AccountType.kt | 2 +- .../common/constants/IntentKeys.kt | 2 +- .../common/constants/RequestCodes.kt | 2 +- .../yogeshpaliyal/common/data/AccountModel.kt | 2 +- .../java/com/yogeshpaliyal/common/db/DbDao.kt | 8 ++++++-- .../CryptoException.kt | 6 +++--- .../DbBackupRestore.kt | 6 ++---- .../EncryptionHelper.kt | 9 +++++++-- .../yogeshpaliyal/common/utils/BackupUtils.kt | 2 +- .../common/utils/DateTimeHelper.kt | 3 ++- .../common/utils/StringHelper.kt | 2 +- .../yogeshpaliyal/common/ExampleUnitTest.kt | 2 +- .../keypasscompose/ExampleInstrumentedTest.kt | 2 +- .../keypasscompose/MainActivity.kt | 8 +++++++- .../ui/theme/Material3Components.kt | 10 +++++++++- .../keypasscompose/ExampleUnitTest.kt | 2 +- 34 files changed, 97 insertions(+), 61 deletions(-) delete mode 100644 app/src/main/java/com/yogeshpaliyal/keypass/InfoModel.kt rename common/src/main/java/com/yogeshpaliyal/common/{db_helper => dbhelper}/CryptoException.kt (70%) rename common/src/main/java/com/yogeshpaliyal/common/{db_helper => dbhelper}/DbBackupRestore.kt (91%) rename common/src/main/java/com/yogeshpaliyal/common/{db_helper => dbhelper}/EncryptionHelper.kt (93%) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 7643783a..74709d9d 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,8 @@ + diff --git a/app/src/androidTest/java/com/yogeshpaliyal/keypass/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/yogeshpaliyal/keypass/ExampleInstrumentedTest.kt index e7e069e0..bcdb1cee 100644 --- a/app/src/androidTest/java/com/yogeshpaliyal/keypass/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/yogeshpaliyal/keypass/ExampleInstrumentedTest.kt @@ -2,7 +2,7 @@ package com.yogeshpaliyal.keypass import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/com/yogeshpaliyal/keypass/ui/nav/DashboardActivityTest.kt b/app/src/androidTest/java/com/yogeshpaliyal/keypass/ui/nav/DashboardActivityTest.kt index 8f8a9144..5659536a 100644 --- a/app/src/androidTest/java/com/yogeshpaliyal/keypass/ui/nav/DashboardActivityTest.kt +++ b/app/src/androidTest/java/com/yogeshpaliyal/keypass/ui/nav/DashboardActivityTest.kt @@ -5,14 +5,14 @@ import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.action.ViewActions.replaceText import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers.* +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.ActivityScenarioRule -import com.yogeshpaliyal.common.AppDatabase import com.yogeshpaliyal.common.data.AccountModel import com.yogeshpaliyal.keypass.R import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest -import org.junit.Assert.* import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/InfoModel.kt b/app/src/main/java/com/yogeshpaliyal/keypass/InfoModel.kt deleted file mode 100644 index ee6b5ca8..00000000 --- a/app/src/main/java/com/yogeshpaliyal/keypass/InfoModel.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.yogeshpaliyal.keypass - -/* -* @author Yogesh Paliyal -* techpaliyal@gmail.com -* https://techpaliyal.com -* created on 23-01-2021 10:33 -*/ -data class InfoModel( - var user_id: String, - var username: String, - var password: String, - var notes: String, - var insertedDate: Long, - var lastUpdatedDate: Long -) diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/data/MyAccountModel.kt b/app/src/main/java/com/yogeshpaliyal/keypass/data/MyAccountModel.kt index 7c644481..4942deb0 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/data/MyAccountModel.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/data/MyAccountModel.kt @@ -3,7 +3,7 @@ package com.yogeshpaliyal.keypass.data import com.google.gson.Gson import com.yogeshpaliyal.common.data.AccountModel import com.yogeshpaliyal.keypass.R -import com.yogeshpaliyal.keypass.constants.AccountType +import com.yogeshpaliyal.common.constants.AccountType import com.yogeshpaliyal.universalAdapter.listener.UniversalViewType import com.yogeshpaliyal.universalAdapter.model.BaseDiffUtil diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/service/BasicService.kt b/app/src/main/java/com/yogeshpaliyal/keypass/service/BasicService.kt index 18a7c182..396fe563 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/service/BasicService.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/service/BasicService.kt @@ -19,7 +19,14 @@ import android.app.assist.AssistStructure import android.app.assist.AssistStructure.ViewNode import android.os.Build import android.os.CancellationSignal -import android.service.autofill.* +import android.service.autofill.AutofillService +import android.service.autofill.Dataset +import android.service.autofill.FillCallback +import android.service.autofill.FillRequest +import android.service.autofill.FillResponse +import android.service.autofill.SaveCallback +import android.service.autofill.SaveInfo +import android.service.autofill.SaveRequest import android.util.ArrayMap import android.util.Log import android.view.autofill.AutofillId @@ -28,7 +35,6 @@ import android.widget.RemoteViews import android.widget.Toast import androidx.annotation.RequiresApi import com.yogeshpaliyal.keypass.R -import java.util.* /** * A very basic [AutofillService] implementation that only shows dynamic-generated datasets diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/service/MyAutoFillService.kt b/app/src/main/java/com/yogeshpaliyal/keypass/service/MyAutoFillService.kt index c9d07cb1..d8a646b2 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/service/MyAutoFillService.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/service/MyAutoFillService.kt @@ -2,7 +2,11 @@ package com.yogeshpaliyal.keypass.service import android.os.Build import android.os.CancellationSignal -import android.service.autofill.* +import android.service.autofill.AutofillService +import android.service.autofill.FillCallback +import android.service.autofill.FillRequest +import android.service.autofill.SaveCallback +import android.service.autofill.SaveRequest import androidx.annotation.RequiresApi /* diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/AddTOTPViewModel.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/AddTOTPViewModel.kt index e01fb2bd..fd484c50 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/AddTOTPViewModel.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/AddTOTPViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope import com.yogeshpaliyal.common.data.AccountModel import com.yogeshpaliyal.common.utils.Event import com.yogeshpaliyal.keypass.R -import com.yogeshpaliyal.keypass.constants.AccountType +import com.yogeshpaliyal.common.constants.AccountType import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt index 99c4ba7a..887c87c3 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.yogeshpaliyal.keypass.constants.RequestCodes +import com.yogeshpaliyal.common.constants.RequestCodes import com.yogeshpaliyal.keypass.databinding.ActivityScannerBinding import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/auth/AuthenticationActivity.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/auth/AuthenticationActivity.kt index 21ea9c61..a0620bb7 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/auth/AuthenticationActivity.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/auth/AuthenticationActivity.kt @@ -8,7 +8,9 @@ import android.util.Log import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.biometric.BiometricManager -import androidx.biometric.BiometricManager.Authenticators.* +import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG +import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK +import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL import androidx.biometric.BiometricPrompt import androidx.core.content.ContextCompat import com.yogeshpaliyal.keypass.R diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/backup/BackupActivity.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/backup/BackupActivity.kt index e0e9b0ec..3f29e772 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/backup/BackupActivity.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/backup/BackupActivity.kt @@ -1,7 +1,10 @@ package com.yogeshpaliyal.keypass.ui.backup import android.app.Activity -import android.content.* +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent import android.net.Uri import android.os.Bundle import android.widget.Toast @@ -12,7 +15,19 @@ import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.yogeshpaliyal.common.utils.* +import com.yogeshpaliyal.common.utils.backupAccounts +import com.yogeshpaliyal.common.utils.canUserAccessBackupDirectory +import com.yogeshpaliyal.common.utils.clearBackupKey +import com.yogeshpaliyal.common.utils.formatCalendar +import com.yogeshpaliyal.common.utils.getBackupDirectory +import com.yogeshpaliyal.common.utils.getBackupTime +import com.yogeshpaliyal.common.utils.getOrCreateBackupKey +import com.yogeshpaliyal.common.utils.isAutoBackupEnabled +import com.yogeshpaliyal.common.utils.overrideAutoBackup +import com.yogeshpaliyal.common.utils.setAutoBackupEnabled +import com.yogeshpaliyal.common.utils.setBackupDirectory +import com.yogeshpaliyal.common.utils.setBackupTime +import com.yogeshpaliyal.common.utils.setOverrideAutoBackup import com.yogeshpaliyal.keypass.R import com.yogeshpaliyal.keypass.databinding.BackupActivityBinding import com.yogeshpaliyal.keypass.databinding.LayoutBackupKeypharseBinding diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/DashboardViewModel.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/DashboardViewModel.kt index d4f9d699..1eadd187 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/DashboardViewModel.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/DashboardViewModel.kt @@ -1,8 +1,11 @@ package com.yogeshpaliyal.keypass.ui.home import android.app.Application -import androidx.lifecycle.* -import com.yogeshpaliyal.common.AppDatabase +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MediatorLiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.viewModelScope import com.yogeshpaliyal.common.data.AccountModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/HomeFragment.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/HomeFragment.kt index 4e3ea614..f03cb453 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/home/HomeFragment.kt @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import com.yogeshpaliyal.common.data.AccountModel import com.yogeshpaliyal.keypass.R -import com.yogeshpaliyal.keypass.constants.AccountType +import com.yogeshpaliyal.common.constants.AccountType import com.yogeshpaliyal.keypass.data.MyAccountModel import com.yogeshpaliyal.keypass.databinding.FragmentHomeBinding import com.yogeshpaliyal.keypass.listener.AccountsClickListener diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/BottomNavViewModel.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/BottomNavViewModel.kt index 47446e57..4993cc50 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/BottomNavViewModel.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/BottomNavViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import com.yogeshpaliyal.common.AppDatabase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt index 48549d2f..7d4aab18 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.lifecycleScope import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.yogeshpaliyal.common.db_helper.createBackup -import com.yogeshpaliyal.common.db_helper.restoreBackup +import com.yogeshpaliyal.common.dbhelper.createBackup +import com.yogeshpaliyal.common.dbhelper.restoreBackup import com.yogeshpaliyal.common.utils.email import com.yogeshpaliyal.common.utils.getOrCreateBackupKey import com.yogeshpaliyal.common.utils.setBackupDirectory diff --git a/app/src/test/java/com/yogeshpaliyal/keypass/ExampleUnitTest.kt b/app/src/test/java/com/yogeshpaliyal/keypass/ExampleUnitTest.kt index 5ef08375..9204d989 100644 --- a/app/src/test/java/com/yogeshpaliyal/keypass/ExampleUnitTest.kt +++ b/app/src/test/java/com/yogeshpaliyal/keypass/ExampleUnitTest.kt @@ -1,6 +1,6 @@ package com.yogeshpaliyal.keypass -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test /** diff --git a/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt b/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt index 4ac83953..f6f3c363 100644 --- a/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt +++ b/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt @@ -1,7 +1,6 @@ package com.yogeshpaliyal.common import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith diff --git a/common/src/main/java/com/yogeshpaliyal/common/AppDatabase.kt b/common/src/main/java/com/yogeshpaliyal/common/AppDatabase.kt index 51adbfa0..4ff85368 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/AppDatabase.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/AppDatabase.kt @@ -3,7 +3,7 @@ package com.yogeshpaliyal.common import androidx.room.Database import androidx.room.RoomDatabase import com.yogeshpaliyal.common.data.AccountModel -import com.yogeshpaliyal.keypass.db.DbDao +import com.yogeshpaliyal.common.db.DbDao /* * @author Yogesh Paliyal diff --git a/common/src/main/java/com/yogeshpaliyal/common/constants/AccountType.kt b/common/src/main/java/com/yogeshpaliyal/common/constants/AccountType.kt index d46e97fc..916ff281 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/constants/AccountType.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/constants/AccountType.kt @@ -1,4 +1,4 @@ -package com.yogeshpaliyal.keypass.constants +package com.yogeshpaliyal.common.constants annotation class AccountType() { companion object { diff --git a/common/src/main/java/com/yogeshpaliyal/common/constants/IntentKeys.kt b/common/src/main/java/com/yogeshpaliyal/common/constants/IntentKeys.kt index 6a1a850b..93485754 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/constants/IntentKeys.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/constants/IntentKeys.kt @@ -1,4 +1,4 @@ -package com.yogeshpaliyal.keypass.constants +package com.yogeshpaliyal.common.constants object IntentKeys { const val SCANNED_TEXT = "scanned_text" diff --git a/common/src/main/java/com/yogeshpaliyal/common/constants/RequestCodes.kt b/common/src/main/java/com/yogeshpaliyal/common/constants/RequestCodes.kt index 1d43f589..b97ca827 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/constants/RequestCodes.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/constants/RequestCodes.kt @@ -1,4 +1,4 @@ -package com.yogeshpaliyal.keypass.constants +package com.yogeshpaliyal.common.constants object RequestCodes { const val SCANNER = 342 diff --git a/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt b/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt index c7a8727c..73cc6cb8 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt @@ -6,7 +6,7 @@ import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName import com.yogeshpaliyal.common.utils.TOTPHelper import com.yogeshpaliyal.common.utils.getRandomString -import com.yogeshpaliyal.keypass.constants.AccountType +import com.yogeshpaliyal.common.constants.AccountType /* * @author Yogesh Paliyal diff --git a/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt b/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt index c99977b1..eb57146b 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt @@ -1,7 +1,11 @@ -package com.yogeshpaliyal.keypass.db +package com.yogeshpaliyal.common.db import androidx.lifecycle.LiveData -import androidx.room.* +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import com.yogeshpaliyal.common.data.AccountModel import kotlinx.coroutines.flow.Flow diff --git a/common/src/main/java/com/yogeshpaliyal/common/db_helper/CryptoException.kt b/common/src/main/java/com/yogeshpaliyal/common/dbhelper/CryptoException.kt similarity index 70% rename from common/src/main/java/com/yogeshpaliyal/common/db_helper/CryptoException.kt rename to common/src/main/java/com/yogeshpaliyal/common/dbhelper/CryptoException.kt index 3b038865..2450cf2b 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/db_helper/CryptoException.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/dbhelper/CryptoException.kt @@ -1,4 +1,4 @@ -package com.yogeshpaliyal.keypass.db_helper +package com.yogeshpaliyal.common.dbhelper /* * @author Yogesh Paliyal @@ -8,6 +8,6 @@ package com.yogeshpaliyal.keypass.db_helper */ class CryptoException : Exception { - constructor() {} - constructor(message: String?, throwable: Throwable?) : super(message, throwable) {} + constructor() + constructor(message: String?, throwable: Throwable?) : super(message, throwable) } diff --git a/common/src/main/java/com/yogeshpaliyal/common/db_helper/DbBackupRestore.kt b/common/src/main/java/com/yogeshpaliyal/common/dbhelper/DbBackupRestore.kt similarity index 91% rename from common/src/main/java/com/yogeshpaliyal/common/db_helper/DbBackupRestore.kt rename to common/src/main/java/com/yogeshpaliyal/common/dbhelper/DbBackupRestore.kt index 7627b8fa..7dec5cb8 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/db_helper/DbBackupRestore.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/dbhelper/DbBackupRestore.kt @@ -1,16 +1,14 @@ -package com.yogeshpaliyal.common.db_helper +package com.yogeshpaliyal.common.dbhelper import android.content.ContentResolver import android.net.Uri import androidx.room.withTransaction import com.google.gson.Gson import com.yogeshpaliyal.common.AppDatabase +import com.yogeshpaliyal.common.constants.AccountType import com.yogeshpaliyal.common.data.BackupData import com.yogeshpaliyal.common.utils.getRandomString -import com.yogeshpaliyal.keypass.constants.AccountType -import com.yogeshpaliyal.keypass.db_helper.EncryptionHelper import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.* import kotlinx.coroutines.withContext /* diff --git a/common/src/main/java/com/yogeshpaliyal/common/db_helper/EncryptionHelper.kt b/common/src/main/java/com/yogeshpaliyal/common/dbhelper/EncryptionHelper.kt similarity index 93% rename from common/src/main/java/com/yogeshpaliyal/common/db_helper/EncryptionHelper.kt rename to common/src/main/java/com/yogeshpaliyal/common/dbhelper/EncryptionHelper.kt index dab3a06a..0f95b61f 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/db_helper/EncryptionHelper.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/dbhelper/EncryptionHelper.kt @@ -1,4 +1,4 @@ -package com.yogeshpaliyal.keypass.db_helper +package com.yogeshpaliyal.common.dbhelper import java.io.IOException import java.io.InputStream @@ -6,7 +6,12 @@ import java.io.OutputStream import java.security.InvalidKeyException import java.security.Key import java.security.NoSuchAlgorithmException -import javax.crypto.* +import javax.crypto.BadPaddingException +import javax.crypto.Cipher +import javax.crypto.CipherInputStream +import javax.crypto.CipherOutputStream +import javax.crypto.IllegalBlockSizeException +import javax.crypto.NoSuchPaddingException import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec diff --git a/common/src/main/java/com/yogeshpaliyal/common/utils/BackupUtils.kt b/common/src/main/java/com/yogeshpaliyal/common/utils/BackupUtils.kt index a16cc127..f61801e9 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/utils/BackupUtils.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/utils/BackupUtils.kt @@ -5,7 +5,7 @@ import android.net.Uri import android.text.TextUtils import androidx.documentfile.provider.DocumentFile import com.yogeshpaliyal.common.AppDatabase -import com.yogeshpaliyal.common.db_helper.createBackup +import com.yogeshpaliyal.common.dbhelper.createBackup import java.security.SecureRandom /* diff --git a/common/src/main/java/com/yogeshpaliyal/common/utils/DateTimeHelper.kt b/common/src/main/java/com/yogeshpaliyal/common/utils/DateTimeHelper.kt index 3bb18c3c..8c33c9d0 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/utils/DateTimeHelper.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/utils/DateTimeHelper.kt @@ -1,7 +1,8 @@ package com.yogeshpaliyal.common.utils import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale /* * @author Yogesh Paliyal diff --git a/common/src/main/java/com/yogeshpaliyal/common/utils/StringHelper.kt b/common/src/main/java/com/yogeshpaliyal/common/utils/StringHelper.kt index 66bc301d..36f87213 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/utils/StringHelper.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/utils/StringHelper.kt @@ -1,6 +1,6 @@ package com.yogeshpaliyal.common.utils -import java.util.* +import java.util.UUID /* * @author Yogesh Paliyal diff --git a/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt b/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt index 8f2ace3d..6eb040ee 100644 --- a/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt +++ b/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt @@ -1,6 +1,6 @@ package com.yogeshpaliyal.common -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test /** diff --git a/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt b/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt index 74ce5d3e..04bdf881 100644 --- a/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt +++ b/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt @@ -2,7 +2,7 @@ package com.yogeshpaliyal.keypasscompose import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt index 9156c16b..78e5efb9 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt @@ -10,7 +10,13 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Menu import androidx.compose.material.icons.filled.Star -import androidx.compose.material3.* +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt index fdb36f8d..f43317ec 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt @@ -3,7 +3,15 @@ package com.yogeshpaliyal.keypasscompose.ui.theme import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.RowScope -import androidx.compose.material.* +import androidx.compose.material.AppBarDefaults +import androidx.compose.material.BottomAppBar +import androidx.compose.material.DrawerDefaults +import androidx.compose.material.FabPosition +import androidx.compose.material.Scaffold +import androidx.compose.material.ScaffoldState +import androidx.compose.material.SnackbarHost +import androidx.compose.material.SnackbarHostState +import androidx.compose.material.rememberScaffoldState import androidx.compose.material3.MaterialTheme import androidx.compose.material3.contentColorFor import androidx.compose.runtime.Composable diff --git a/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt b/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt index 5393aaa5..59cb9b28 100644 --- a/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt +++ b/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt @@ -1,6 +1,6 @@ package com.yogeshpaliyal.keypasscompose -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test /**