Bump version to 6.1.4

Add default values to global duration scale resolution.
2026-04-03 00:42:58 +01:00 · 2022-11-11 13:16:10 -05:00 · 2022-11-11 13:14:20 -05:00
2 changed files with 8 additions and 8 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,14 +51,14 @@ ktlint {
 }

 def canonicalVersionCode = 1160
-def canonicalVersionName = "6.1.3"
+def canonicalVersionName = "6.1.4"

 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 5,
+                  'armeabi-v7a' : 6,
+                  'arm64-v8a'   : 7,
+                  'x86'         : 8,
+                  'x86_64'      : 9]

 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]

--- a/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt
@@ -9,8 +9,8 @@ fun ContentResolver.areSystemAnimationsDisabled(): Boolean {
  return if (Build.VERSION.SDK_INT >= 26) {
    !ValueAnimator.areAnimatorsEnabled()
  } else {
-    val durationScale = Settings.System.getFloat(this, Settings.Global.ANIMATOR_DURATION_SCALE)
-    val transitionScale = Settings.System.getFloat(this, Settings.Global.TRANSITION_ANIMATION_SCALE)
+    val durationScale = Settings.Global.getFloat(this, Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f)
+    val transitionScale = Settings.Global.getFloat(this, Settings.Global.TRANSITION_ANIMATION_SCALE, 1.0f)

    !(durationScale > 0f && transitionScale > 0f)
  }
Author	SHA1	Message	Date
Greyson Parrelli	00161f05fd	Bump version to 6.1.4	2022-11-11 13:16:10 -05:00
Alex Hart	8cd0184962	Add default values to global duration scale resolution.	2022-11-11 13:14:20 -05:00