Merge branch 'release/0.8.19'

Author: bmarty

CHANGES.rst

@@ -56,32 +56,31 @@ Let says your application is named MyRiot : You have to create your own flavour.
 Modify riot-android/vector/build.gradle
 ---------------------------------------
 
-In "productFlavors" section, duplicate "app" group if you plan to use GCM/FCM or "appfdroid" if don't.
+In "productFlavors" section, duplicate "app" group if you plan to use FCM or "appfdroid" if don't.
 
-for example, with GCM, it would give
+for example, with FCM, it would give
 
 ```
     appmyriot {
         applicationId "im.myriot"
         // use the version name
         versionCode rootProject.ext.versionCodeProp
         versionName rootProject.ext.versionNameProp
-        resValue "string", "allow_gcm_use", "true"
-        resValue "string", "allow_ga_use", "true"
-        resValue "string", "short_flavor_description", "G"
-        resValue "string", "flavor_description", "GooglePlay"
+        buildConfigField "boolean", "ALLOW_FCM_USE", "true"
+        buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
+        buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
     }
 ```
 
-- if you use GCM, duplicate appCompile at the end of this file and replace appCompile by appmyriotCompile.
+- if you use FCM, duplicate appCompile at the end of this file and replace appCompile by appmyriotCompile.
 - if you don't, update the "if (!getGradle().getStartParameter().getTaskRequests().toString().contains("fdroid"))" to include your flavor.
 
 Create your flavour directory
 -----------------------------
 
-- Copy riot-android/vector/src/app or appfroid if you use GCM or you don’t.
+- Copy riot-android/vector/src/app or appfroid if you use FCM or you don’t.
 - Rename it to appmyriot.
-- If you use GCM, you will need to generate your own google-services.json.
+- If you use FCM, you will need to generate your own google-services.json.
 
 Customise your flavour
 ----------------------

README.md

@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 81800
-    versionNameProp = "0.8.18"
+    versionCodeProp = 81900
+    versionNameProp = "0.8.19"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

build.gradle

@@ -66,3 +66,7 @@ DO NOT COMMIT
 ### Bad comment format in XML resources. Use <!-- --> instead of //
 ^\s*\/\/
 
+### Bad RTL support, use attribute with Start and End
+layout_constraintRight_
+layout_constraintLeft_
+

tools/check/forbidden_strings_in_resources.txt

@@ -24,7 +24,7 @@ android {
         versionName rootProject.ext.versionNameProp
 
         // custom values
-        resValue "string", "bug_report_url",  "https://riot.im/bugreports/submit"
+        resValue "string", "bug_report_url", "https://riot.im/bugreports/submit"
 
         ndk {
             abiFilters "armeabi-v7a", "x86"
@@ -92,34 +92,51 @@ android {
             // use the version name
             versionCode rootProject.ext.versionCodeProp
             versionName rootProject.ext.versionNameProp
-            resValue "string", "allow_gcm_use", "true"
-            resValue "string", "allow_ga_use", "true"
-            resValue "string", "short_flavor_description", "G"
-            resValue "string", "flavor_description", "GooglePlay"
+            buildConfigField "boolean", "ALLOW_FCM_USE", "true"
+            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
+            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
         }
 
         appfdroid {
             applicationId "im.vector.alpha"
             // use the version name
             versionCode rootProject.ext.versionCodeProp
             versionName rootProject.ext.versionNameProp
-            resValue "string", "allow_gcm_use", "false"
-            resValue "string", "allow_ga_use", "false"
-            resValue "string", "short_flavor_description", "F"
-            resValue "string", "flavor_description", "FDroid"
+            buildConfigField "boolean", "ALLOW_FCM_USE", "false"
+            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
+            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }
     }
 
     lintOptions {
-        disable 'InvalidPackage'
-        disable 'MissingTranslation'
-        disable 'RestrictedApi'
-        disable 'ImpliedQuantity'
+        warning 'MissingTranslation'
 
         // Treat some warnings as errors
+        // Resources
+        error 'TypographyEllipsis'
+        error 'ImpliedQuantity'
+
+        // UX
+        error 'ButtonOrder'
+
+        // Layout
         error 'StringFormatCount'
         error 'HardcodedText'
         error 'SpUsage'
+        error 'ObsoleteLayoutParam'
+        error 'InefficientWeight'
+        error 'DisableBaselineAlignment'
+        error 'ScrollViewSize'
+
+        // RTL
+        error 'RtlEnabled'
+        error 'RtlHardcoded'
+        error 'RtlSymmetry'
+
+        // Code
+        error 'SetTextI18n'
+        error 'ViewConstructor'
+        error 'UseValueOf'
     }
 
     repositories {
@@ -159,6 +176,9 @@ dependencies {
     // Kotlin KTX
     implementation 'androidx.core:core-ktx:0.3'
 
+    // Kotlin coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.2'
+
     implementation 'com.android.support:multidex:1.0.0'
 
     implementation 'me.leolin:ShortcutBadger:1.1.2@aar'
@@ -221,15 +241,14 @@ dependencies {
     implementation(name: 'react-native', ext: 'aar')
     implementation(name: 'react-native-locale-detector', ext: 'aar')
 
-
     // another tracking than GA
     implementation 'org.piwik.sdk:piwik-sdk:2.0.0'
 
     /************* flavors management **************/
 
     // app flavor only
-    appImplementation 'com.google.firebase:firebase-core:16.0.3'
-    appImplementation 'com.google.firebase:firebase-messaging:17.3.0'
+    appImplementation 'com.google.firebase:firebase-core:16.0.4'
+    appImplementation 'com.google.firebase:firebase-messaging:17.3.4'
 
     // fdroid flavor only
 

vector/build.gradle

@@ -8,19 +8,12 @@
             android:name="firebase_analytics_collection_deactivated"
             android:value="true" />
 
-        <service
-            android:name="im.vector.gcm.MatrixGcmListenerService">
+        <service android:name="im.vector.push.fcm.VectorFirebaseMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
-        <service
-            android:name="im.vector.gcm.MatrixInstanceIDListenerService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
-            </intent-filter>
-        </service>
-
     </application>
+
 </manifest>

vector/libs/matrix-sdk.aar

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2014 OpenMarket Ltd
+ * Copyright 2017 Vector Creations Ltd
+ * Copyright 2018 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.push.fcm;
+
+import android.app.Activity;
+import android.content.Context;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.InstanceIdResult;
+
+import org.matrix.androidsdk.util.Log;
+
+/**
+ * This class store the FCM token in SharedPrefs and ensure this token is retrieved.
+ * It has an alter ego in the fdroid variant.
+ */
+public class FcmHelper {
+    private static final String LOG_TAG = FcmHelper.class.getSimpleName();
+
+    private static final String PREFS_KEY_FCM_TOKEN = "FCM_TOKEN";
+
+    /**
+     * Retrieves the FCM registration token.
+     *
+     * @return the FCM token or null if not received from FCM
+     */
+    @Nullable
+    public static String getFcmToken(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getString(PREFS_KEY_FCM_TOKEN, null);
+    }
+
+    /**
+     * Store FCM token to the SharedPrefs
+     *
+     * @param context android context
+     * @param token   the token to store
+     */
+    public static void storeFcmToken(@NonNull Context context,
+                                     @Nullable String token) {
+        PreferenceManager.getDefaultSharedPreferences(context)
+                .edit()
+                .putString(PREFS_KEY_FCM_TOKEN, token)
+                .apply();
+    }
+
+    /**
+     * onNewToken may not be called on application upgrade, so ensure my shared pref is set
+     *
+     * @param activity the first launch Activity
+     */
+    public static void ensureFcmTokenIsRetrieved(final Activity activity) {
+        if (TextUtils.isEmpty(getFcmToken(activity))) {
+            try {
+                FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(activity, new OnSuccessListener<InstanceIdResult>() {
+                    @Override
+                    public void onSuccess(InstanceIdResult instanceIdResult) {
+                        storeFcmToken(activity, instanceIdResult.getToken());
+                    }
+                });
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "## ensureFcmTokenIsRetrieved() : failed " + e.getMessage(), e);
+            }
+        }
+    }
+}