Merge pull request #807 from session-foundation/release/1.20.6

Bring release 1.20.6 to dev

app/build.gradle

@@ -13,8 +13,8 @@ configurations.forEach {
     it.exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 387
-def canonicalVersionName = "1.20.5"
+def canonicalVersionCode = 388
+def canonicalVersionName = "1.20.6"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -864,12 +864,18 @@ data class RetrieveOnce<T>(val retrieval: () -> T?) {
 
     val value: T?
         get() {
-            if (triedToRetrieve) { return _value }
+            synchronized(this) {
+                if (triedToRetrieve) {
+                    return _value
+                }
 
-            triedToRetrieve = true
-            _value = retrieval()
-            return _value
+                triedToRetrieve = true
+                _value = retrieval()
+                return _value
+            }
         }
 
-    fun updateTo(value: T?) { _value = value }
+    fun updateTo(value: T?) {
+        _value = value
+    }
 }

scripts/build-and-release.py

@@ -218,6 +218,11 @@ if shutil.which('gh') is None:
     print('`gh` command not found. It is required to automate fdroid releases. Please install it from https://cli.github.com/', file=sys.stderr)
     sys.exit(1)
 
+# Make sure fdroid command is available
+if shutil.which('fdroid') is None:
+    print('`fdroid` command not found. It is required to automate fdroid releases. Please install it from https://f-droid.org/', file=sys.stderr)
+    sys.exit(1)
+
 # Make sure credentials file exists
 if not os.path.isfile(credentials_file_path):
     print(f'Credentials file not found at {credentials_file_path}. You should ask the project maintainer for the file.', file=sys.stderr)
@@ -253,7 +258,7 @@ huawei_build_result = build_releases(
 # If the a github release draft exists, upload the apks to the release
 try:
     release_info = json.loads(subprocess.check_output(f'gh release view --json isDraft {play_build_result.version_name}', shell=True, cwd=project_root))
-    if release_info['draft'] == True:
+    if release_info['isDraft'] == True:
         print(f'Uploading build artifact to the release {play_build_result.version_name} draft...')
         files_to_upload = [*play_build_result.apk_paths,
                            play_build_result.bundle_path,