Last minute bug fixes

michaelkourlas · Feb 27, 2021 · 3d55a0a · 3d55a0a
1 parent 161e978
commit 3d55a0a
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 14 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## 0.6.16 ##
+
+* Bug fixes
+
 ## 0.6.15 ##
 
 * Bug fixes

diff --git a/fastlane/metadata/android/en-US/changelogs/136.txt b/fastlane/metadata/android/en-US/changelogs/136.txt
@@ -0,0 +1,2 @@
+0.6.16
+• 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 135
-        versionName '0.6.15'
+        versionCode 136
+        versionName '0.6.16'
     }
     flavorDimensions 'version', 'demo'
     productFlavors {

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/conversation/ConversationActivity.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/conversation/ConversationActivity.kt
@@ -1025,6 +1025,7 @@ open class ConversationActivity(val bubble: Boolean = false) :
                     R.id.coordinator_layout,
                     resources.getQuantityString(
                         R.plurals.conversation_message_deleted,
+                        messages.size,
                         messages.size),
                     getString(R.string.undo),
                     {

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/conversations/ConversationsActivity.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/conversations/ConversationsActivity.kt
@@ -327,11 +327,13 @@ open class ConversationsActivity(val archived: Boolean = false) :
 
         // Perform initial setup as well as account and DID check
         performAccountDidCheck()
-        performInitialSetup()
+        val firstSyncRequired = performInitialSetup()
 
-        // Refresh and perform limited synchronization
-        adapter.refresh()
-        SyncWorker.performSynchronization(this, forceRecent = true)
+        // Refresh and perform limited synchronization\
+        if (!firstSyncRequired) {
+            adapter.refresh()
+            SyncWorker.performSynchronization(this, forceRecent = true)
+        }
 
         // Refresh on resume just in case the contacts permission was newly
         // granted and we need to add the contact names and photos
@@ -389,15 +391,20 @@ open class ConversationsActivity(val archived: Boolean = false) :
     /**
      * Performs initial setup following sign-in or upgrade.
      */
-    private fun performInitialSetup() {
+    private fun performInitialSetup(): Boolean {
         // After the user configures an account, do an initial synchronization
         // with the SwipeRefreshLayout refresh icon
+        val firstSyncRequired = getFirstSyncAfterSignIn(this)
         if (getFirstSyncAfterSignIn(this)) {
             val swipeRefreshLayout = findViewById<SwipeRefreshLayout>(
                 R.id.swipe_refresh_layout)
             swipeRefreshLayout.isRefreshing = true
             SyncWorker.performSynchronization(this, forceRecent = false)
 
+            val emptyTextView = findViewById<TextView>(
+                R.id.empty_text)
+            emptyTextView.text = getString(R.string.conversations_first_sync)
+
             val format = SimpleDateFormat("MMM d, yyyy",
                                           Locale.getDefault())
             val date = format.format(getStartDate(this))
@@ -421,6 +428,8 @@ open class ConversationsActivity(val archived: Boolean = false) :
             enablePushNotifications(this.applicationContext,
                                     activityToShowError = this)
         }
+
+        return firstSyncRequired
     }
 
     /**
@@ -835,6 +844,7 @@ open class ConversationsActivity(val archived: Boolean = false) :
                     R.id.coordinator_layout,
                     resources.getQuantityString(
                         R.plurals.conversations_archived,
+                        messages.size,
                         messages.size),
                     getString(R.string.undo),
                     {
@@ -879,6 +889,7 @@ open class ConversationsActivity(val archived: Boolean = false) :
                     R.id.coordinator_layout,
                     resources.getQuantityString(
                         R.plurals.conversations_unarchived,
+                        messages.size,
                         messages.size),
                     getString(R.string.undo),
                     {
@@ -941,6 +952,7 @@ open class ConversationsActivity(val archived: Boolean = false) :
                     this@ConversationsActivity,
                     R.id.coordinator_layout,
                     resources.getQuantityString(R.plurals.conversations_deleted,
+                                                messages.size,
                                                 messages.size),
                     getString(R.string.undo),
                     {

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
@@ -26,9 +26,6 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import net.kourlas.voipms_sms.R
 import net.kourlas.voipms_sms.notifications.Notifications
 import net.kourlas.voipms_sms.preferences.getDids
@@ -115,9 +112,7 @@ class RetrieveDidsWorker(context: Context, params: WorkerParameters) :
                 setDids(applicationContext,
                         getDids(applicationContext).plus(dids))
                 enablePushNotifications(applicationContext)
-                GlobalScope.launch(Dispatchers.Default) {
-                    replaceIndex(applicationContext)
-                }
+                replaceIndex(applicationContext)
             }
         } catch (e: CancellationException) {
             throw 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
@@ -174,7 +174,7 @@ class VerifyCredentialsWorker(context: Context, params: WorkerParameters) :
          */
         fun verifyCredentials(context: Context, email: String,
                               password: String) {
-            val work = OneTimeWorkRequestBuilder<RetrieveDidsWorker>()
+            val work = OneTimeWorkRequestBuilder<VerifyCredentialsWorker>()
                 .setInputData(
                     workDataOf(
                         context.getString(

diff --git a/voipms-sms/src/main/res/values/strings.xml b/voipms-sms/src/main/res/values/strings.xml
@@ -217,6 +217,7 @@
     <string name="conversations_message_you">You:</string>
     <string name="conversations_no_account">No account configured</string>
     <string name="conversations_no_dids">You have no configured phone numbers.</string>
+    <string name="conversations_first_sync">Please wait for the first synchronization to complete…</string>
     <string name="conversations_no_messages">You have no messages associated with the selected phone number.</string>
     <string name="conversations_no_results">No results found for \'%1$s\'</string>
     <string name="conversations_perm_denied_contacts">Contacts permission required to view names and photos</string>