New new appid for playstore

Stephen Paul Weber created 2 years ago

Someone took ours somehow?

Change summary

.builds/debian-stable.yml                                  | 2 +-
build.gradle                                               | 2 ++
src/conversationsPlaystore/res/values/strings.xml          | 4 ++++
src/main/java/eu/siacs/conversations/entities/Contact.java | 3 ++-
4 files changed, 9 insertions(+), 2 deletions(-)

Detailed changes

.builds/debian-stable.yml 🔗

@@ -11,7 +11,7 @@ packages:
 - android-sdk
 secrets:
 - 7eed327c-05c7-49b4-baed-a4d8785588d5
-- 9c6cc176-db6c-4158-9abb-2cb1662d5ca9
+- b412b263-bdde-410b-997e-6326aba90132
 - 6b782fde-a43b-4988-b102-38fa541bb788
 environment:
   ANDROID_SDK_ROOT: /home/build/android

build.gradle 🔗

@@ -174,6 +174,7 @@ android {
         playstore {
             dimension "distribution"
             versionNameSuffix "+playstore"
+            applicationIdSuffix "playstore"
         }
         free {
             dimension "distribution"
@@ -220,6 +221,7 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk.debugSymbolLevel = 'full'
         }
         debug {
             shrinkResources true

src/conversationsPlaystore/res/values/strings.xml 🔗

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="applicationId">com.cheogram.android.playstore</string>
+</resources>

src/main/java/eu/siacs/conversations/entities/Contact.java 🔗

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
+import eu.siacs.conversations.BuildConfig;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.android.AbstractPhoneContact;
@@ -641,7 +642,7 @@ public class Contact implements ListItem, Blockable {
 
     public PhoneAccountHandle phoneAccountHandle() {
         ComponentName componentName = new ComponentName(
-            "com.cheogram.android",
+            BuildConfig.APPLICATION_ID,
             "com.cheogram.android.ConnectionService"
         );
         return new PhoneAccountHandle(componentName, phoneAccountLabel());