Skip to content

Commit 2f9d20f

Browse files
grigorevmpgrigorevmp
committed
QuickPass 2.0 RC6
- Splash screen - App will auto close after 10min inactivity time - New font - Shortcuts updated -- Working fixed -- New icon -- Adaptive icon for dark mode - Security fixed -- Now, you can't open app through shortcut without entering password - New icon - New password panel - Password encrypting! -- You can now encrypt your password to know that nobody will see it even if hack your root storage data - Password View and Adding design improved - All new main screen -- Smooth panel for all passwords -- Statistic copied to main screen - Backup restoring fixed (For cyphered passwords) - Home UI updated - Added bank card icons near bank pins - Optimization for some constructions - Fixes - Translation updated - Duration of animation adjusted - Added back buttons - Smooth transitions through screens - UX update -- You can now restore your pass (Check Setting =)) -- Alert screen for log out in Account page - Settings update -- Auto asking permission for writing to storage -- New icons for export/import -- Tips for export/import now always available - Libraries updated (16/10/20)
1 parent d4e107e commit 2f9d20f

File tree

6 files changed

+52
-21
lines changed

6 files changed

+52
-21
lines changed

‎app/src/main/java/com/mikhailgrigorev/quickpass/PassGenActivity.kt

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,16 @@ class PassGenActivity : AppCompatActivity() {
214214
if (pCursor.moveToFirst()) {
215215
val nameIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_NAME)
216216
val passIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_PASS)
217+
val cIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_CIPHER)
217218
do {
218219
val pass = pCursor.getString(passIndex).toString()
219220
val login = pCursor.getString(nameIndex).toString()
220-
realPass.add(Pair(login, pass))
221+
val dbCipherIndex = pCursor.getString(cIndex).toString()
222+
val pm = PasswordManager()
223+
if (dbCipherIndex == "crypted" )
224+
realPass.add(Pair(login, pm.decrypt(pass).toString()))
225+
else
226+
realPass.add(Pair(login, pass))
221227
} while (pCursor.moveToNext())
222228
}
223229

@@ -1224,6 +1230,7 @@ class PassGenActivity : AppCompatActivity() {
12241230
subContains = false
12251231
gSubContains = false
12261232
for (pass2 in realPass){
1233+
12271234
if(pass.first != pass2.first){
12281235
for(i in 0..(pass.second.length - 4)){
12291236
if (pass2.second.contains(pass.second.subSequence(i, i + 3))){
@@ -1345,6 +1352,7 @@ class PassGenActivity : AppCompatActivity() {
13451352
realPass.clear()
13461353
realQuality.clear()
13471354
realMap.clear()
1355+
desc.clear()
13481356

13491357
try {
13501358
val pCursor: Cursor = pDatabase.query(
@@ -1360,10 +1368,16 @@ class PassGenActivity : AppCompatActivity() {
13601368
if (pCursor.moveToFirst()) {
13611369
val nameIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_NAME)
13621370
val passIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_PASS)
1371+
val cIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_CIPHER)
13631372
do {
13641373
val pass = pCursor.getString(passIndex).toString()
13651374
val login = pCursor.getString(nameIndex).toString()
1366-
realPass.add(Pair(login, pass))
1375+
val dbCipherIndex = pCursor.getString(cIndex).toString()
1376+
val pm = PasswordManager()
1377+
if (dbCipherIndex == "crypted" )
1378+
realPass.add(Pair(login, pm.decrypt(pass).toString()))
1379+
else
1380+
realPass.add(Pair(login, pass))
13671381
} while (pCursor.moveToNext())
13681382
}
13691383

@@ -1381,7 +1395,6 @@ class PassGenActivity : AppCompatActivity() {
13811395
do {
13821396
val pass = pCursor.getString(passIndex).toString()
13831397
val dbdescIndex = pCursor.getString(descIndex).toString()
1384-
desc.add(dbdescIndex)
13851398
val myPasswordManager = PasswordManager()
13861399
val evaluation: Float =
13871400
myPasswordManager.evaluatePassword(pass)
@@ -1408,6 +1421,7 @@ class PassGenActivity : AppCompatActivity() {
14081421
val dbTag = pCursor.getString(tagsIndex).toString()
14091422
tags.add(dbTag)
14101423
group.add("none")
1424+
desc.add(dbdescIndex)
14111425
}
14121426
else {
14131427
val dbLogin = pCursor.getString(nameIndex).toString()
@@ -1417,6 +1431,7 @@ class PassGenActivity : AppCompatActivity() {
14171431
val dbTag = pCursor.getString(tagsIndex).toString()
14181432
tags.add(0, dbTag)
14191433
group.add(0, "#favorite")
1434+
desc.add(0, dbdescIndex)
14201435
}
14211436

14221437

@@ -1468,6 +1483,7 @@ class PassGenActivity : AppCompatActivity() {
14681483
realPass.clear()
14691484
realQuality.clear()
14701485
realMap.clear()
1486+
desc.clear()
14711487

14721488
safePass = 0
14731489
unsafePass = 0
@@ -1488,10 +1504,16 @@ class PassGenActivity : AppCompatActivity() {
14881504
if (pCursor.moveToFirst()) {
14891505
val nameIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_NAME)
14901506
val passIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_PASS)
1507+
val cIndex: Int = pCursor.getColumnIndex(pdbHelper.KEY_CIPHER)
14911508
do {
14921509
val pass = pCursor.getString(passIndex).toString()
14931510
val login = pCursor.getString(nameIndex).toString()
1494-
realPass.add(Pair(login, pass))
1511+
val dbCipherIndex = pCursor.getString(cIndex).toString()
1512+
val pm = PasswordManager()
1513+
if (dbCipherIndex == "crypted" )
1514+
realPass.add(Pair(login, pm.decrypt(pass).toString()))
1515+
else
1516+
realPass.add(Pair(login, pass))
14951517
} while (pCursor.moveToNext())
14961518
}
14971519

@@ -1509,7 +1531,6 @@ class PassGenActivity : AppCompatActivity() {
15091531
do {
15101532
val pass = pCursor.getString(passIndex).toString()
15111533
val dbdescIndex = pCursor.getString(descIndex).toString()
1512-
desc.add(dbdescIndex)
15131534
val myPasswordManager = PasswordManager()
15141535
val evaluation: Float =
15151536
myPasswordManager.evaluatePassword(pass)
@@ -1536,6 +1557,7 @@ class PassGenActivity : AppCompatActivity() {
15361557
val dbTag = pCursor.getString(tagsIndex).toString()
15371558
tags.add(dbTag)
15381559
group.add("none")
1560+
desc.add(dbdescIndex)
15391561
}
15401562
else {
15411563
val dbLogin = pCursor.getString(nameIndex).toString()
@@ -1545,6 +1567,7 @@ class PassGenActivity : AppCompatActivity() {
15451567
val dbTag = pCursor.getString(tagsIndex).toString()
15461568
tags.add(0, dbTag)
15471569
group.add(0, "#favorite")
1570+
desc.add(0, dbdescIndex)
15481571
}
15491572

15501573

‎app/src/main/java/com/mikhailgrigorev/quickpass/SettingsActivity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ class SettingsActivity : AppCompatActivity() {
218218
inputEditTextField.setSingleLine()
219219
val dialog = AlertDialog.Builder(this, R.style.AlertDialogCustom)
220220
.setTitle(getString(R.string.newMail))
221+
.setMessage(getString(R.string.mail_description))
221222
.setView(inputEditTextField, 100, 100, 100, 100)
222223
.setPositiveButton(getString(R.string.saveButton)){ _, _ ->
223224
newMail = inputEditTextField.text.toString()
@@ -259,6 +260,7 @@ class SettingsActivity : AppCompatActivity() {
259260

260261
val dialog = AlertDialog.Builder(this, R.style.AlertDialogCustom)
261262
.setTitle(getString(R.string.newMail))
263+
.setMessage(getString(R.string.mail_description))
262264
.setView(inputEditTextField, 100, 100, 100, 100)
263265
.setPositiveButton(getString(R.string.saveButton)){ _, _ ->
264266
newMail = inputEditTextField.text.toString()

‎app/src/main/res/layout/activity_pass_gen.xml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,22 @@
116116
android:focusable="true"
117117
android:contentDescription="@string/add_password_plus" />
118118

119+
<com.google.android.material.floatingactionbutton.FloatingActionButton
120+
android:id="@+id/extraNewPass"
121+
android:layout_width="wrap_content"
122+
android:layout_height="wrap_content"
123+
android:layout_marginBottom="20dp"
124+
android:contentDescription="@string/add_password_plus"
125+
android:elevation="25dp"
126+
android:visibility="gone"
127+
app:backgroundTint="@color/white"
128+
app:elevation="25dp"
129+
app:layout_constraintBottom_toBottomOf="parent"
130+
app:layout_constraintEnd_toEndOf="parent"
131+
app:layout_constraintStart_toStartOf="parent"
132+
app:srcCompat="@drawable/plus"
133+
app:tint="?attr/colorPrimary" />
134+
119135
<androidx.core.widget.NestedScrollView
120136
android:layout_width="match_parent"
121137
android:layout_height="match_parent"
@@ -670,21 +686,7 @@
670686
app:srcCompat="@drawable/emoticon_wink_outline"
671687
app:tint="@color/black" />
672688

673-
<com.google.android.material.floatingactionbutton.FloatingActionButton
674-
android:id="@+id/extraNewPass"
675-
android:layout_width="wrap_content"
676-
android:layout_height="wrap_content"
677-
android:layout_marginBottom="20dp"
678-
android:contentDescription="@string/add_password_plus"
679-
android:elevation="25dp"
680-
android:visibility="gone"
681-
app:backgroundTint="@color/white"
682-
app:elevation="25dp"
683-
app:layout_constraintBottom_toBottomOf="@+id/expand2"
684-
app:layout_constraintEnd_toEndOf="parent"
685-
app:layout_constraintStart_toStartOf="parent"
686-
app:srcCompat="@drawable/plus"
687-
app:tint="?attr/colorPrimary" />
689+
688690

689691
<androidx.constraintlayout.widget.Guideline
690692
android:id="@+id/guideline"

‎app/src/main/res/layout/activity_set_pin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
app:boxCornerRadiusBottomStart="15dp"
5555
app:boxCornerRadiusTopEnd="15dp"
5656
app:boxCornerRadiusTopStart="15dp"
57-
app:helperText="You need to input 4 numbers"
57+
app:helperText="@string/set_pin_helper"
5858
app:endIconMode="clear_text"
5959
app:layout_constraintEnd_toEndOf="parent"
6060
app:layout_constraintStart_toStartOf="parent"

‎app/src/main/res/values-ru/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,6 @@
155155
<string name="crypted">Crypted</string>
156156
<string name="bank_card">Bank Card</string>
157157
<string name="add_password_plus">Add password</string>
158+
<string name="set_pin_helper">Вам необходимо ввести 4 цифры</string>
159+
<string name="mail_description">Если вы забудете пароль, он будет отправлен на вашу электронную почту</string>
158160
</resources>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,6 @@
170170
<string name="crypted">Crypted</string>
171171
<string name="bank_card">Bank Card</string>
172172
<string name="add_password_plus">Add password</string>
173+
<string name="set_pin_helper">You should input 4 numbers</string>
174+
<string name="mail_description">If you forget your password, it will be sent to your email</string>
173175
</resources>

0 commit comments

Comments
 (0)