Bug fixes

michaelkourlas · Feb 28, 2021 · 2c35a37 · 2c35a37
1 parent 3d55a0a
commit 2c35a37
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 31 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## 0.6.17 ##
+
+* Bug fixes
+
 ## 0.6.16 ##
 
 * Bug fixes

diff --git a/fastlane/metadata/android/en-US/changelogs/137.txt b/fastlane/metadata/android/en-US/changelogs/137.txt
@@ -0,0 +1,2 @@
+0.6.17
+• Bug fixes
diff --git a/voipms-sms/build.gradle b/voipms-sms/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'net.kourlas.voipms_sms'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 136
-        versionName '0.6.16'
+        versionCode 137
+        versionName '0.6.17'
     }
     flavorDimensions 'version', 'demo'
     productFlavors {

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/receivers/SyncBootReceiver.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/receivers/SyncBootReceiver.kt
@@ -30,11 +30,11 @@ class SyncBootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         try {
             if (context == null || intent == null) {
-                return
+                throw Exception("No context or intent provided")
             }
             if (intent.action != "android.intent.action.BOOT_COMPLETED"
                 && intent.action != "android.intent.action.ACTION_LOCKED_BOOT_COMPLETED") {
-                return
+                throw Exception("Unrecognized action " + intent.action)
             }
             SyncIntervalReceiver.setInterval(context)
         } catch (e: Exception) {

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/receivers/SyncIntervalReceiver.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/receivers/SyncIntervalReceiver.kt
@@ -37,17 +37,13 @@ class SyncIntervalReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         try {
             if (context == null || intent == null) {
-                return
+                throw Exception("No context or intent provided")
             }
             if (intent.action != context.getString(
                     R.string.sync_interval_action)) {
-                return
+                throw Exception("Unrecognized action " + intent.action)
             }
-            val forceRecent = intent.extras?.get(
-                context.getString(
-                    R.string.sync_interval_force_recent)) as Boolean?
-                              ?: throw Exception("Force recent missing")
-            SyncWorker.performSynchronization(context, forceRecent)
+            SyncWorker.performSynchronization(context)
         } catch (e: Exception) {
             logException(e)
         }

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt
@@ -25,7 +25,6 @@ import androidx.work.*
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
-import kotlinx.coroutines.CancellationException
 import net.kourlas.voipms_sms.R
 import net.kourlas.voipms_sms.notifications.Notifications
 import net.kourlas.voipms_sms.preferences.getDids
@@ -114,8 +113,6 @@ class RetrieveDidsWorker(context: Context, params: WorkerParameters) :
                 enablePushNotifications(applicationContext)
                 replaceIndex(applicationContext)
             }
-        } catch (e: CancellationException) {
-            throw e
         } catch (e: Exception) {
             logException(e)
         }
@@ -145,8 +142,6 @@ class RetrieveDidsWorker(context: Context, params: WorkerParameters) :
                 mapOf("api_username" to getEmail(applicationContext),
                       "api_password" to getPassword(applicationContext),
                       "method" to "getDIDsInfo"))
-        } catch (e: CancellationException) {
-            throw e
         } catch (e: IOException) {
             error = applicationContext.getString(
                 R.string.preferences_dids_error_api_request)

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt
@@ -24,7 +24,6 @@ import android.os.Build
 import androidx.work.*
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
-import kotlinx.coroutines.CancellationException
 import net.kourlas.voipms_sms.R
 import net.kourlas.voipms_sms.network.NetworkManager
 import net.kourlas.voipms_sms.notifications.Notifications
@@ -175,8 +174,6 @@ class SendMessageWorker(context: Context, params: WorkerParameters) :
                     setOf(ConversationId(inlineReplyDid, inlineReplyContact)),
                     inlineReplyMessages = listOf(message))
             }
-        } catch (e: CancellationException) {
-            throw e
         } catch (e: Exception) {
             logException(e)
             error = applicationContext.getString(

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt
@@ -143,6 +143,7 @@ class SyncWorker(context: Context, params: WorkerParameters) :
                 SyncIntervalReceiver.setInterval(applicationContext)
             }
         } catch (e: CancellationException) {
+            // We need to propagate the exception from processRequests
             throw e
         } catch (e: Exception) {
             logException(e)

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt
@@ -24,7 +24,6 @@ import android.os.Build
 import androidx.work.*
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
-import kotlinx.coroutines.CancellationException
 import net.kourlas.voipms_sms.R
 import net.kourlas.voipms_sms.notifications.Notifications
 import net.kourlas.voipms_sms.utils.httpPostWithMultipartFormData
@@ -101,8 +100,6 @@ class VerifyCredentialsWorker(context: Context, params: WorkerParameters) :
             if (response != null) {
                 return verifyResponse(response)
             }
-        } catch (e: CancellationException) {
-            throw e
         } catch (e: Exception) {
             logException(e)
         }
@@ -126,8 +123,6 @@ class VerifyCredentialsWorker(context: Context, params: WorkerParameters) :
                 mapOf("api_username" to email,
                       "api_password" to password,
                       "method" to "getDIDsInfo"))
-        } catch (e: CancellationException) {
-            throw e
         } catch (e: IOException) {
             error = applicationContext.getString(
                 R.string.verify_credentials_error_api_request)

diff --git a/voipms-sms/src/main/res/values/strings.xml b/voipms-sms/src/main/res/values/strings.xml
@@ -313,7 +313,6 @@
 
     <!-- SyncIntervalReceiver -->
     <string name="sync_interval_action" translatable="false">net.kourlas.voipms_sms.SYNC_INTERVAL_ACTION</string>
-    <string name="sync_interval_force_recent" translatable="false">net.kourlas.voipms_sms.SYNC_INTERVAL_FORCE_RECENT</string>
 
     <!-- Sent message receiver -->
     <string name="sent_message_action" translatable="false">net.kourlas.voipms_sms.SENT_MESSAGE_ACTION_%1$s_%2$s</string>

diff --git a/...ry/kotlin/net/kourlas/voipms_sms/notifications/workers/NotificationsRegistrationWorker.kt b/...ry/kotlin/net/kourlas/voipms_sms/notifications/workers/NotificationsRegistrationWorker.kt
@@ -24,7 +24,6 @@ import android.os.Build
 import androidx.work.*
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
-import kotlinx.coroutines.CancellationException
 import net.kourlas.voipms_sms.R
 import net.kourlas.voipms_sms.notifications.Notifications
 import net.kourlas.voipms_sms.preferences.*
@@ -63,8 +62,6 @@ class NotificationsRegistrationWorker(context: Context,
             val responses = getVoipMsApiCallbackResponses(dids)
             callbackFailedDids = parseVoipMsApiCallbackResponses(dids,
                                                                  responses)
-        } catch (e: CancellationException) {
-            throw e
         } catch (e: Exception) {
             logException(e)
         }
@@ -137,8 +134,6 @@ class NotificationsRegistrationWorker(context: Context,
                               + "voipmssms-notify?did={TO}"),
                           "url_callback_retry" to "0")))
                 responses[did] = didResponses
-            } catch (e: CancellationException) {
-                throw e
             } catch (e: IOException) {
                 // Do nothing.
             } catch (e: JsonDataException) {

diff --git a/voipms-sms/src/primary/kotlin/net/kourlas/voipms_sms/sms/receivers/AppIndexingReceiver.kt b/voipms-sms/src/primary/kotlin/net/kourlas/voipms_sms/sms/receivers/AppIndexingReceiver.kt
@@ -30,7 +30,8 @@ import net.kourlas.voipms_sms.utils.logException
 class AppIndexingReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         try {
-            AppIndexingWorker.performIndexing(context ?: return)
+            AppIndexingWorker.performIndexing(
+                context ?: throw Exception("No context provided"))
         } catch (e: Exception) {
             logException(e)
         }