Skip to content

Commit c1841a8

Browse files
authored
Merge pull request #752 from naveensingh/fix_751_crash
Reset database on next app update
2 parents e255d72 + 50198b1 commit c1841a8

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
alias(libs.plugins.android)
77
alias(libs.plugins.kotlinAndroid)
88
alias(libs.plugins.kotlinSerialization)
9-
alias(libs.plugins.parcelize)
109
alias(libs.plugins.ksp)
1110
base
1211
}

app/proguard-rules.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,8 @@
2828
public static <1> INSTANCE;
2929
kotlinx.serialization.KSerializer serializer(...);
3030
}
31+
32+
# Gson
33+
-keep class com.simplemobiletools.commons.models.SimpleContact { *; }
34+
-keep class com.simplemobiletools.smsmessenger.models.Attachment { *; }
35+
-keep class com.simplemobiletools.smsmessenger.models.MessageAttachment { *; }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ fun Context.getFileSizeFromUri(uri: Uri): Long {
988988

989989
// fix a glitch at enabling Release version minifying from 5.12.3
990990
// reset messages in 5.14.3 again, as PhoneNumber is no longer minified
991+
// reset messages in 5.19.1 again, as SimpleContact is no longer minified
991992
fun Context.clearAllMessagesIfNeeded() {
992993
if (!config.wasDbCleared) {
993994
ensureBackgroundThread {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const val XML_MIME_TYPE = "text/xml"
3434
const val TXT_MIME_TYPE = "text/plain"
3535
const val IMPORT_SMS = "import_sms"
3636
const val IMPORT_MMS = "import_mms"
37-
const val WAS_DB_CLEARED = "was_db_cleared_2"
37+
const val WAS_DB_CLEARED = "was_db_cleared_3"
3838
const val EXTRA_VCARD_URI = "vcard"
3939
const val SCHEDULED_MESSAGE_ID = "scheduled_message_id"
4040
const val SOFT_KEYBOARD_HEIGHT = "soft_keyboard_height"

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
alias(libs.plugins.android).apply(false)
33
alias(libs.plugins.kotlinAndroid).apply(false)
4-
alias(libs.plugins.parcelize).apply(false)
54
alias(libs.plugins.kotlinSerialization).apply(false)
65
alias(libs.plugins.ksp).apply(false)
76
}

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,4 @@ room = [
6060
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
6161
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
6262
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
63-
parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
6463
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

0 commit comments

Comments
 (0)