Skip to content

Commit 30399df

Browse files
committed
reset messages at app upgrade
1 parent 9af293a commit 30399df

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,7 @@ class MainActivity : SimpleActivity() {
8383
}
8484
}
8585

86-
// fix a glitch at enabling Release version minifying from 5.12.3
87-
// reset messages in 5.14.3 again, as PhoneNumber is no longer minified
88-
if (!config.wasDbCleared) {
89-
ensureBackgroundThread {
90-
messagesDB.deleteAll()
91-
}
92-
config.wasDbCleared = true
93-
}
86+
clearAllMessagesIfNeeded()
9487
}
9588

9689
override fun onResume() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ class ThreadActivity : SimpleActivity() {
9292
return
9393
}
9494

95+
clearAllMessagesIfNeeded()
9596
threadId = intent.getLongExtra(THREAD_ID, 0L)
9697
intent.getStringExtra(THREAD_TITLE)?.let {
9798
supportActionBar?.title = it

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,3 +982,14 @@ fun Context.getSendMessageSettings(): Settings {
982982
settings.group = config.sendGroupMessageMMS
983983
return settings
984984
}
985+
986+
// fix a glitch at enabling Release version minifying from 5.12.3
987+
// reset messages in 5.14.3 again, as PhoneNumber is no longer minified
988+
fun Context.clearAllMessagesIfNeeded() {
989+
if (!config.wasDbCleared) {
990+
ensureBackgroundThread {
991+
messagesDB.deleteAll()
992+
}
993+
config.wasDbCleared = true
994+
}
995+
}

0 commit comments

Comments
 (0)