Merge pull request #656 from kcotugno/fix-json-import-partial-export

Fix import for partial exports

Author: tibbi

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

@@ -1,12 +1,16 @@
 package com.simplemobiletools.smsmessenger.helpers
 
 import android.content.Context
+import android.util.JsonToken
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.simplemobiletools.commons.extensions.showErrorToast
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.smsmessenger.extensions.*
-import com.simplemobiletools.smsmessenger.helpers.MessagesImporter.ImportResult.*
+import com.simplemobiletools.smsmessenger.extensions.config
+import com.simplemobiletools.smsmessenger.helpers.MessagesImporter.ImportResult.IMPORT_FAIL
+import com.simplemobiletools.smsmessenger.helpers.MessagesImporter.ImportResult.IMPORT_NOTHING_NEW
+import com.simplemobiletools.smsmessenger.helpers.MessagesImporter.ImportResult.IMPORT_OK
+import com.simplemobiletools.smsmessenger.helpers.MessagesImporter.ImportResult.IMPORT_PARTIAL
 import com.simplemobiletools.smsmessenger.models.MmsBackup
 import com.simplemobiletools.smsmessenger.models.SmsBackup
 import java.io.File
@@ -40,43 +44,39 @@ class MessagesImporter(private val context: Context) {
                     while (jsonReader.hasNext()) {
                         jsonReader.beginObject()
                         while (jsonReader.hasNext()) {
-                            if (jsonReader.nextName().equals("sms")) {
-                                if (config.importSms) {
-                                    jsonReader.beginArray()
-                                    while (jsonReader.hasNext()) {
-                                        try {
-                                            val message = gson.fromJson<SmsBackup>(jsonReader, smsMessageType)
-                                            messageWriter.writeSmsMessage(message)
-                                            messagesImported++
-                                        } catch (e: Exception) {
-                                            context.showErrorToast(e)
-                                            messagesFailed++
-                                        }
-                                    }
-                                    jsonReader.endArray()
-                                } else {
+                            val nextToken = jsonReader.peek()
+                            if (nextToken.ordinal == JsonToken.NAME.ordinal) {
+                                val msgType = jsonReader.nextName()
+
+                                if ((!msgType.equals("sms") && !msgType.equals("mms")) ||
+                                    (msgType.equals("sms") && !config.importSms) ||
+                                    (msgType.equals("mms") && !config.importMms)
+                                ) {
                                     jsonReader.skipValue()
+                                    continue
                                 }
-                            }
 
-                            if (jsonReader.nextName().equals("mms")) {
-                                if (config.importMms) {
-                                    jsonReader.beginArray()
-
-                                    while (jsonReader.hasNext()) {
-                                        try {
+                                jsonReader.beginArray()
+                                while (jsonReader.hasNext()) {
+                                    try {
+                                        if (msgType.equals("sms")) {
+                                            val message = gson.fromJson<SmsBackup>(jsonReader, smsMessageType)
+                                            messageWriter.writeSmsMessage(message)
+                                        } else {
                                             val message = gson.fromJson<MmsBackup>(jsonReader, mmsMessageType)
                                             messageWriter.writeMmsMessage(message)
-                                            messagesImported++
-                                        } catch (e: Exception) {
-                                            context.showErrorToast(e)
-                                            messagesFailed++
                                         }
+
+                                        messagesImported++
+                                    } catch (e: Exception) {
+                                        context.showErrorToast(e)
+                                        messagesFailed++
+
                                     }
-                                    jsonReader.endArray()
-                                } else {
-                                    jsonReader.skipValue()
                                 }
+                                jsonReader.endArray()
+                            } else {
+                                jsonReader.skipValue()
                             }
                         }