Make sure both flavors have a different applicationID suffix

.gitignore

@@ -13,6 +13,7 @@ sentry.properties
 .directory
 javadoc
 mobile/src/fcm/google-services.json
+mobile/src/fcm/google-services_old.json
 olm/
 tmp/
 .chglog/

.gitlab-ci.yml

@@ -48,8 +48,6 @@ deploy_nightly:
   - test -z "$DEBUG_KEYSTORE" && exit 0
   # build the APKs!
   - ./gradlew assembleDebug
-  - ls -lah /builds/Nordgedanken/simplematrix/SimpleMatrix/mobile/build/outputs/apk/fcm/debug/
-  - ls -lah /builds/Nordgedanken/simplematrix/SimpleMatrix/mobile/build/outputs/apk/fdroid/debug/
   - fdroid nightly -v
   except:
     variables:

mobile/build.gradle

@@ -79,12 +79,12 @@ android {
     flavorDimensions "notifcations"
     productFlavors {
         fdroid {
-            applicationId "blog.nordgedanken.simplematrix"
+            applicationIdSuffix ".fdroid"
             versionNameSuffix "-fdroid"
             buildConfigField "boolean", "ALLOW_FCM_USE", "false"
         }
         fcm {
-            applicationId "blog.nordgedanken.simplematrix"
+            applicationIdSuffix ".fcm"
             versionNameSuffix "-fcm"
             buildConfigField "boolean", "ALLOW_FCM_USE", "true"
         }