fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #763 from naveensingh/fix_r8_crash 

Properly clear messages from database
This commit is contained in:
Tibor Kaputa 2023-09-30 20:35:21 +02:00 committed by GitHub
parent 67e9b4587b 4582bc5289
commit e735502700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View File

@ -64,7 +64,9 @@ class MainActivity : SimpleActivity() {
handleAppPasswordProtection { handleAppPasswordProtection {
wasProtectionHandled = it wasProtectionHandled = it
if (it) { if (it) {
clearAllMessagesIfNeeded {
loadMessages() loadMessages()
}
} else { } else {
finish() finish()
} }
@ -74,8 +76,6 @@ class MainActivity : SimpleActivity() {
if (checkAppSideloading()) { if (checkAppSideloading()) {
return return
} }
clearAllMessagesIfNeeded()
} }
override fun onResume() { override fun onResume() {

3
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -136,7 +136,6 @@ class ThreadActivity : SimpleActivity() {
return return
} }
clearAllMessagesIfNeeded()
threadId = intent.getLongExtra(THREAD_ID, 0L) threadId = intent.getLongExtra(THREAD_ID, 0L)
intent.getStringExtra(THREAD_TITLE)?.let { intent.getStringExtra(THREAD_TITLE)?.let {
binding.threadToolbar.title = it binding.threadToolbar.title = it
@ -152,7 +151,9 @@ class ThreadActivity : SimpleActivity() {
handleAppPasswordProtection { handleAppPasswordProtection {
wasProtectionHandled = it wasProtectionHandled = it
if (it) { if (it) {
clearAllMessagesIfNeeded {
loadConversation() loadConversation()
}
} else { } else {
finish() finish()
} }

7
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
View File

@ -989,12 +989,15 @@ fun Context.getFileSizeFromUri(uri: Uri): Long {
// fix a glitch at enabling Release version minifying from 5.12.3 // fix a glitch at enabling Release version minifying from 5.12.3
// reset messages in 5.14.3 again, as PhoneNumber is no longer minified // reset messages in 5.14.3 again, as PhoneNumber is no longer minified
// reset messages in 5.19.1 again, as SimpleContact is no longer minified // reset messages in 5.19.1 again, as SimpleContact is no longer minified
fun Context.clearAllMessagesIfNeeded() { fun Context.clearAllMessagesIfNeeded(callback: () -> Unit) {
if (!config.wasDbCleared) { if (!config.wasDbCleared) {
ensureBackgroundThread { ensureBackgroundThread {
messagesDB.deleteAll() messagesDB.deleteAll()
}
config.wasDbCleared = true config.wasDbCleared = true
callback()
}
} else {
callback()
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
View File

@ -34,7 +34,7 @@ const val XML_MIME_TYPE = "text/xml"
const val TXT_MIME_TYPE = "text/plain" const val TXT_MIME_TYPE = "text/plain"
const val IMPORT_SMS = "import_sms" const val IMPORT_SMS = "import_sms"
const val IMPORT_MMS = "import_mms" const val IMPORT_MMS = "import_mms"
const val WAS_DB_CLEARED = "was_db_cleared_3" const val WAS_DB_CLEARED = "was_db_cleared_4"
const val EXTRA_VCARD_URI = "vcard" const val EXTRA_VCARD_URI = "vcard"
const val SCHEDULED_MESSAGE_ID = "scheduled_message_id" const val SCHEDULED_MESSAGE_ID = "scheduled_message_id"
const val SOFT_KEYBOARD_HEIGHT = "soft_keyboard_height" const val SOFT_KEYBOARD_HEIGHT = "soft_keyboard_height"