Skip to content

Commit 429e1a3

Browse files
grigorevmpgrigorevmp
committed
- Quality checker improved
1 parent fdd4dc1 commit 429e1a3

File tree

5 files changed

+66
-16
lines changed

5 files changed

+66
-16
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class AboutActivity : AppCompatActivity() {
1717
private val _keyTHEME = "themePreference"
1818
private val _preferenceFile = "quickPassPreference"
1919

20+
var condition = false
2021
override fun onCreate(savedInstanceState: Bundle?) {
2122

2223
// Set Theme
@@ -41,9 +42,12 @@ class AboutActivity : AppCompatActivity() {
4142

4243
val handler = Handler()
4344
val r = Runnable {
44-
val intent = Intent(this, LoginAfterSplashActivity::class.java)
45-
startActivity(intent)
46-
finish()
45+
if(condition) {
46+
condition=false
47+
val intent = Intent(this, LoginAfterSplashActivity::class.java)
48+
startActivity(intent)
49+
finish()
50+
}
4751
}
4852
handler.postDelayed(r, 600000)
4953

@@ -57,18 +61,21 @@ class AboutActivity : AppCompatActivity() {
5761

5862
// My link to Telegram
5963
telegram.setOnClickListener {
64+
condition=false
6065
val i = Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/grigorevmp"))
6166
startActivity(i)
6267
}
6368

6469
// My link to VK
6570
vkontakte.setOnClickListener {
71+
condition=false
6672
val i = Intent(Intent.ACTION_VIEW, Uri.parse("https://vk.com/grigorevmp"))
6773
startActivity(i)
6874
}
6975

7076
// My link to GitHub
7177
gitHub.setOnClickListener {
78+
condition=false
7279
val i = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/grigorevmp/QuickPass-Mobile-Password-manager/"))
7380
startActivity(i)
7481
}
@@ -81,6 +88,7 @@ class AboutActivity : AppCompatActivity() {
8188
}
8289

8390
private fun sendEmail() {
91+
condition=false
8492
val recipient = "16112000m@gmai.com"
8593
val subject = "Quick password app"
8694
val message = "Hello, Mikhail \n"

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class AccountActivity : AppCompatActivity() {
3636
private val realQuality: ArrayList<String> = ArrayList()
3737
private val realMap: MutableMap<String, ArrayList<String>> = mutableMapOf()
3838

39+
var condition = false
40+
3941
@SuppressLint("Recycle", "SetTextI18n")
4042
override fun onCreate(savedInstanceState: Bundle?) {
4143

@@ -58,9 +60,12 @@ class AccountActivity : AppCompatActivity() {
5860
// Finish app after some time
5961
val handler = Handler()
6062
val r = Runnable {
61-
val intent = Intent(this, LoginAfterSplashActivity::class.java)
62-
startActivity(intent)
63-
finish()
63+
if(condition) {
64+
condition=false
65+
val intent = Intent(this, LoginAfterSplashActivity::class.java)
66+
startActivity(intent)
67+
finish()
68+
}
6469
}
6570
handler.postDelayed(r, 600000)
6671

@@ -163,6 +168,7 @@ class AccountActivity : AppCompatActivity() {
163168
} while (cursor.moveToNext())
164169
}
165170
aboutApp.setOnClickListener {
171+
condition=false
166172
val intent = Intent(this, AboutActivity::class.java)
167173
startActivity(intent)
168174
}
@@ -322,6 +328,7 @@ class AccountActivity : AppCompatActivity() {
322328

323329
// Edit button
324330
editAccount.setOnClickListener {
331+
condition=false
325332
val intent = Intent(this, EditAccountActivity::class.java)
326333
intent.putExtra("login", login)
327334
intent.putExtra("passName", passName)
@@ -330,6 +337,7 @@ class AccountActivity : AppCompatActivity() {
330337

331338
// Settings button
332339
settings.setOnClickListener {
340+
condition=false
333341
val intent = Intent(this, SettingsActivity::class.java)
334342
intent.putExtra("login", login)
335343
intent.putExtra("passName", passName)
@@ -369,6 +377,7 @@ class AccountActivity : AppCompatActivity() {
369377
//val rotation = AnimationUtils.loadAnimation(this, R.anim.rotate_splash)
370378
//rotation.fillAfter = true
371379
//logo.startAnimation(rotation)
380+
condition=false
372381
val intent = Intent()
373382
intent.putExtra("login", login)
374383
intent.putExtra("passName", passName)
@@ -386,6 +395,7 @@ class AccountActivity : AppCompatActivity() {
386395
//val rotation = AnimationUtils.loadAnimation(this, R.anim.rotate_splash)
387396
//rotation.fillAfter = true
388397
//logo.startAnimation(rotation)
398+
condition=false
389399
val intent = Intent()
390400
intent.putExtra("login", login)
391401
intent.putExtra("passName", passName)
@@ -438,6 +448,7 @@ class AccountActivity : AppCompatActivity() {
438448
}
439449
}
440450
private fun exit(sharedPref: SharedPreferences) {
451+
condition=false
441452
sharedPref.edit().remove(_keyUsername).apply()
442453
sharedPref.edit().remove(_keyUsePin).apply()
443454
sharedPref.edit().remove(_keyBio).apply()

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class PassGenActivity : AppCompatActivity() {
7575
private var changeStatusPopUp: PopupWindow = PopupWindow()
7676
private var globalPos: Int = -1
7777
var pm = PasswordManager()
78+
var condition = false
7879

7980
@SuppressLint(
8081
"Recycle", "ClickableViewAccessibility", "ResourceAsColor", "RestrictedApi",
@@ -114,9 +115,12 @@ class PassGenActivity : AppCompatActivity() {
114115
// Finish app after some time
115116

116117
val r = Runnable {
117-
val intent = Intent(this, LoginAfterSplashActivity::class.java)
118-
startActivity(intent)
119-
finish()
118+
if(condition) {
119+
condition=false
120+
val intent = Intent(this, LoginAfterSplashActivity::class.java)
121+
startActivity(intent)
122+
finish()
123+
}
120124
}
121125
handler.postDelayed(r, 600000)
122126

@@ -1025,6 +1029,7 @@ class PassGenActivity : AppCompatActivity() {
10251029

10261030
// Go to accout
10271031
accountAvatar.setOnClickListener {
1032+
condition=false
10281033
val intent = Intent(this, AccountActivity::class.java)
10291034
intent.putExtra("login", login)
10301035
intent.putExtra("activity", "menu")
@@ -1152,6 +1157,7 @@ class PassGenActivity : AppCompatActivity() {
11521157
// Additinal add new password buttons
11531158

11541159
noPasswords.setOnClickListener {
1160+
condition=false
11551161
val intent = Intent(this, NewPasswordActivity::class.java)
11561162
intent.putExtra("login", login)
11571163
intent.putExtra("pass", genPasswordIdField.text.toString())
@@ -1165,6 +1171,7 @@ class PassGenActivity : AppCompatActivity() {
11651171
}
11661172

11671173
extraNewPass.setOnClickListener {
1174+
condition=false
11681175
val intent = Intent(this, NewPasswordActivity::class.java)
11691176
intent.putExtra("login", login)
11701177
intent.putExtra("pass", genPasswordIdField.text.toString())
@@ -1178,6 +1185,7 @@ class PassGenActivity : AppCompatActivity() {
11781185

11791186

11801187
newPass.setOnClickListener {
1188+
condition=false
11811189
val intent = Intent(this, NewPasswordActivity::class.java)
11821190
intent.putExtra("login", login)
11831191
intent.putExtra("pass", genPasswordIdField.text.toString())
@@ -1345,6 +1353,7 @@ class PassGenActivity : AppCompatActivity() {
13451353
}
13461354

13471355
private fun passClickListener(position: Int) {
1356+
condition=false
13481357
val intent = Intent(this, PasswordViewActivity::class.java)
13491358
var isPass = false
13501359
intent.putExtra("login", login)
@@ -1741,6 +1750,7 @@ class PassGenActivity : AppCompatActivity() {
17411750
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
17421751
super.onActivityResult(requestCode, resultCode, data)
17431752
if (requestCode == 1) {
1753+
condition=false
17441754
passwords.clear()
17451755
quality.clear()
17461756
tags.clear()

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class PasswordViewActivity : AppCompatActivity() {
2828
private lateinit var login: String
2929
private lateinit var passName: String
3030
private lateinit var from: String
31+
var condition = false
3132

3233
@SuppressLint("Recycle", "SetTextI18n", "UseCompatLoadingForDrawables")
3334
override fun onCreate(savedInstanceState: Bundle?) {
@@ -55,9 +56,12 @@ class PasswordViewActivity : AppCompatActivity() {
5556
// Finish app after some time
5657
val handler = Handler()
5758
val r = Runnable {
58-
val intent = Intent(this, LoginAfterSplashActivity::class.java)
59-
startActivity(intent)
60-
finish()
59+
if(condition) {
60+
condition=false
61+
val intent = Intent(this, LoginAfterSplashActivity::class.java)
62+
startActivity(intent)
63+
finish()
64+
}
6165
}
6266
handler.postDelayed(r, 600000)
6367

@@ -72,6 +76,7 @@ class PasswordViewActivity : AppCompatActivity() {
7276
from= args?.get("from").toString()
7377

7478
if (from == "short"){
79+
condition=false
7580
val intent = Intent(this, ReLoginActivity::class.java)
7681
startActivityForResult(intent, 1)
7782
}
@@ -367,6 +372,7 @@ class PasswordViewActivity : AppCompatActivity() {
367372
toast(getString(R.string.passwordDeleted))
368373
val intent = Intent(this, PassGenActivity::class.java)
369374
intent.putExtra("login", login)
375+
condition=false
370376
startActivity(intent)
371377
finish()
372378
}
@@ -381,6 +387,7 @@ class PasswordViewActivity : AppCompatActivity() {
381387
}
382388

383389
accountAvatar.setOnClickListener {
390+
condition=false
384391
val intent = Intent(this, AccountActivity::class.java)
385392
intent.putExtra("login", login)
386393
intent.putExtra("activity", "menu")
@@ -413,13 +420,15 @@ class PasswordViewActivity : AppCompatActivity() {
413420
//rotation.fillAfter = true
414421
//logo.startAnimation(rotation)
415422
if(from != "short") {
423+
condition=false
416424
val intent = Intent()
417425
intent.putExtra("login", login)
418426
intent.putExtra("passName", passName)
419427
setResult(1, intent)
420428
finish()
421429
}
422430
else{
431+
condition=false
423432
val intent = Intent(this, PassGenActivity::class.java)
424433
intent.putExtra("login", login)
425434
intent.putExtra("passName", passName)
@@ -429,6 +438,7 @@ class PasswordViewActivity : AppCompatActivity() {
429438
}
430439

431440
editButton.setOnClickListener {
441+
condition=false
432442
val intent = Intent(this, EditPassActivity::class.java)
433443
intent.putExtra("login", login)
434444
intent.putExtra("passName", passName)
@@ -478,12 +488,14 @@ class PasswordViewActivity : AppCompatActivity() {
478488
//rotation.fillAfter = true
479489
//logo.startAnimation(rotation)
480490
if (from != "short") {
491+
condition=false
481492
val intent = Intent()
482493
intent.putExtra("login", login)
483494
intent.putExtra("passName", passName)
484495
setResult(1, intent)
485496
finish()
486497
} else {
498+
condition=false
487499
val intent = Intent(this, PassGenActivity::class.java)
488500
intent.putExtra("login", login)
489501
intent.putExtra("passName", passName)
@@ -498,6 +510,7 @@ class PasswordViewActivity : AppCompatActivity() {
498510
super.onActivityResult(requestCode, resultCode, data)
499511
if (requestCode == 1) {
500512
if (resultCode == 1) {
513+
condition=false
501514
val intent = intent
502515
finish()
503516
startActivity(intent)

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class SettingsActivity : AppCompatActivity() {
4242
private lateinit var login: String
4343
private lateinit var passName: String
4444
private lateinit var imageName: String
45+
var condition = false
4546
@SuppressLint("SetTextI18n", "Recycle", "RestrictedApi")
4647
override fun onCreate(savedInstanceState: Bundle?) {
4748
val pref = getSharedPreferences(_preferenceFile, Context.MODE_PRIVATE)
@@ -68,9 +69,12 @@ class SettingsActivity : AppCompatActivity() {
6869
// Finish app after some time
6970
val handler = Handler()
7071
val r = Runnable {
71-
val intent = Intent(this, LoginAfterSplashActivity::class.java)
72-
startActivity(intent)
73-
finish()
72+
if(condition) {
73+
condition=false
74+
val intent = Intent(this, LoginAfterSplashActivity::class.java)
75+
startActivity(intent)
76+
finish()
77+
}
7478
}
7579
handler.postDelayed(r, 600000)
7680

@@ -314,13 +318,15 @@ class SettingsActivity : AppCompatActivity() {
314318

315319
setPinSwitch.setOnCheckedChangeListener { _, _ ->
316320
if(setPinSwitch.isChecked){
321+
condition=false
317322
val intent = Intent(this, SetPinActivity::class.java)
318323
intent.putExtra("login", login)
319324
intent.putExtra("passName", passName)
320325
startActivity(intent)
321326
finish()
322327
}
323328
else{
329+
condition=false
324330
with(sharedPref.edit()) {
325331
putString(_keyUsePin, "none")
326332
commit()
@@ -337,6 +343,7 @@ class SettingsActivity : AppCompatActivity() {
337343
}
338344
}
339345
else{
346+
condition=false
340347
val intent = Intent(this, SetPinActivity::class.java)
341348
intent.putExtra("login", login)
342349
intent.putExtra("passName", passName)
@@ -1086,6 +1093,7 @@ class SettingsActivity : AppCompatActivity() {
10861093
}
10871094

10881095
back.setOnClickListener {
1096+
condition=false
10891097
val intent = Intent()
10901098
intent.putExtra("login", login)
10911099
intent.putExtra("passName", passName)
@@ -1162,7 +1170,7 @@ class SettingsActivity : AppCompatActivity() {
11621170
override fun onKeyUp(keyCode: Int, msg: KeyEvent?): Boolean {
11631171
when (keyCode) {
11641172
KeyEvent.KEYCODE_BACK -> {
1165-
1173+
condition=false
11661174
val intent = Intent()
11671175
intent.putExtra("login", login)
11681176
intent.putExtra("passName", passName)

0 commit comments

Comments
 (0)