Bump version to 6.28.6

app/build.gradle

@@ -46,14 +46,14 @@ ktlint {
 }
 
 def canonicalVersionCode = 1310
-def canonicalVersionName = "6.28.5"
+def canonicalVersionName = "6.28.6"
 
 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') ]
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt

@@ -60,7 +60,7 @@ class ChangeNumberLockActivity : PassphraseRequiredActivity() {
           Log.i(TAG, "Local (${SignalStore.account().e164}) and remote (${whoAmI.number}) numbers do not match, updating local.")
           Single
             .just(true)
-            .flatMap { changeNumberRepository.changeLocalNumber(whoAmI.number, PNI.parseOrThrow(whoAmI.pni)) }
+            .flatMap { changeNumberRepository.changeLocalNumber(whoAmI.number, PNI.parseUnPrefixedOrThrow(whoAmI.pni)) }
             .compose(ChangeNumberRepository::acquireReleaseChangeNumberLock)
             .map { true }
         }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt

@@ -184,7 +184,7 @@ class ChangeNumberViewModel(
 
   @WorkerThread
   override fun onVerifySuccess(processor: VerifyResponseProcessor): Single<VerifyResponseProcessor> {
-    return changeNumberRepository.changeLocalNumber(number.e164Number, PNI.parseOrThrow(processor.result.verifyAccountResponse.pni))
+    return changeNumberRepository.changeLocalNumber(number.e164Number, PNI.parseUnPrefixedOrThrow(processor.result.verifyAccountResponse.pni))
       .map { processor }
       .onErrorReturn { t ->
         Log.w(TAG, "Error attempting to change local number", t)
@@ -193,7 +193,7 @@ class ChangeNumberViewModel(
   }
 
   override fun onVerifySuccessWithRegistrationLock(processor: VerifyResponseWithRegistrationLockProcessor, pin: String): Single<VerifyResponseWithRegistrationLockProcessor> {
-    return changeNumberRepository.changeLocalNumber(number.e164Number, PNI.parseOrThrow(processor.result.verifyAccountResponse.pni))
+    return changeNumberRepository.changeLocalNumber(number.e164Number, PNI.parseUnPrefixedOrThrow(processor.result.verifyAccountResponse.pni))
       .map { processor }
       .onErrorReturn { t ->
         Log.w(TAG, "Error attempting to change local number", t)