Merge branch 'release/0.8.23'

Author: bmarty

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,6 +3,7 @@
 <!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/riot-android/CONTRIBUTING.md) before submitting your pull request -->
 
 * [ ] Changes has been tested on an Android device or Android emulator with API 16
+* [ ] UI change has been tested on both light and dark themes
 * [ ] Pull request is based on the develop branch
 * [ ] Pull request updates [CHANGES.rst](https://github.com/vector-im/riot-android/blob/develop/CHANGES.rst)
 * [ ] Pull request includes screenshots or videos if containing UI changes

CHANGES.rst

@@ -1,3 +1,28 @@
+Changes in Riot 0.8.23 (2019-02-21)
+===================================================
+
+MatrixSdk:
+ - Upgrade MatrixSdk to version 0.9.17.
+
+Features:
+ - key backup: Trust on Decrypt (#2921)
+ - key backup: new recover method detected (#2926)
+
+Improvements:
+ - keys backup: Setup screen UX improvement
+ - keys backup: Sign Out flow improvement
+ - Improved button styles (states, ripple effect)
+ - Show direct chat section in user details only for other users, not self
+ - Sender name colors in rooms
+
+Other changes:
+ - Remove beta e2e warning (#2946)
+
+Bugfix:
+ - Fix warning "Attribute value must be constant" in VectorHomeActivity
+ - Fix key backup banner doesn't go away after you have restored from backup. (#2943)
+ - Fix issue with registration on some HomeServer (#2985)
+
 Changes in Riot 0.8.22 (2019-02-01)
 ===================================================
 
@@ -38,6 +63,7 @@ Bugfix:
  - Fix issues with Tombstone events (#2866 && #2867)
  - Fix crash on BugReportActivity if previous Activity is destroyed (#2876)
  - Key share request does not go away when user select "verify" (#2781)
+ - Fix crash when entering the settings due to missing push rules (#2893)
 
 Changes in Riot 0.8.21 (2019-01-02)
 ===================================================

CONTRIBUTING.md

@@ -6,6 +6,10 @@ Android support can be found in this [![Android Matrix room #riot-android:matrix
 
 # Specific rules for Matrix Android projects
 
+## Android Studio settings
+
+Please set the "hard wrap" setting of Android Studio to 160 chars, this is the setting we use internally to format the source code (Menu `Settings/Editor/Code Style` then `Hard wrap at`).
+
 ## Compilation
 
 Riot Android uses by default the Matrix Android SDK library (file `matrix-sdk.aar`).

build.gradle

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

tools/check/forbidden_strings_in_resources.txt

@@ -78,3 +78,7 @@ layout_constraintLeft_
 
 ### Use im.vector.preference.VectorPreference to support multiline of the title
 <Preference\n
+
+### Will crash on API < 21. Use ?colorAccent instead
+\?android:colorAccent
+\?android:attr/colorAccent

vector/libs/matrix-sdk.aar

@@ -131,15 +131,18 @@
 
         <!-- activities list starts here -->
         <activity
-            android:name=".activity.LoginActivity"
-            android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="stateHidden|adjustResize">
+            android:name=".activity.LauncherActivity"
+            android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activity.LoginActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.FallbackAccountCreationActivity"
             android:configChanges="orientation|screenSize"
@@ -159,9 +162,6 @@
         <activity
             android:name=".activity.SplashActivity"
             android:configChanges="orientation|screenSize" />
-        <activity
-            android:name=".activity.signout.SignOutActivity"
-            android:label="@string/title_activity_sign_out" />
         <activity
             android:name=".activity.LoggingOutActivity"
             android:configChanges="orientation|screenSize" />
@@ -415,7 +415,7 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.KeysBackupManageActivity"
-            android:label="@string/title_activity_keys_backup_manage" />
+            android:label="@string/encryption_message_recovery" />
 
         <!-- FileProvider -->
         <provider

vector/src/main/AndroidManifest.xml

@@ -23,14 +23,18 @@
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.support.annotation.NonNull;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 
+import org.jetbrains.annotations.NotNull;
 import org.matrix.androidsdk.HomeServerConnectionConfig;
 import org.matrix.androidsdk.MXDataHandler;
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.crypto.IncomingRoomKeyRequest;
 import org.matrix.androidsdk.crypto.IncomingRoomKeyRequestCancellation;
 import org.matrix.androidsdk.crypto.MXCrypto;
+import org.matrix.androidsdk.crypto.keysbackup.KeysBackup;
+import org.matrix.androidsdk.crypto.keysbackup.KeysBackupStateManager;
 import org.matrix.androidsdk.data.Room;
 import org.matrix.androidsdk.data.RoomState;
 import org.matrix.androidsdk.data.metrics.MetricsListener;
@@ -53,12 +57,15 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import im.vector.activity.CommonActivityUtils;
+import im.vector.activity.KeysBackupManageActivity;
 import im.vector.activity.SplashActivity;
 import im.vector.analytics.MetricsListenerProxy;
 import im.vector.push.PushManager;
@@ -100,6 +107,8 @@ public class Matrix {
     // tell if the client should be logged out
     public boolean mHasBeenDisconnected = false;
 
+    public Map<String, KeysBackupStateManager.KeysBackupStateListener> keyBackupStateListeners = new HashMap<>();
+
     // i.e the event has been read from another client
     private static final MXEventListener mLiveEventListener = new MXEventListener() {
         boolean mClearCacheRequired = false;
@@ -495,6 +504,12 @@ public void onSuccess(Void info) {
                 mLoginStorage.removeCredentials(session.getHomeServerConfig());
 
                 session.getDataHandler().removeListener(mLiveEventListener);
+                if (keyBackupStateListeners.get(session.getMyUserId()) != null) {
+                    if (session.getCrypto() != null) {
+                        session.getCrypto().getKeysBackup().removeListener(keyBackupStateListeners.get(session.getMyUserId()));
+                    }
+                    keyBackupStateListeners.remove(session.getMyUserId());
+                }
 
                 VectorApp.removeSyncingSession(session);
 
@@ -530,6 +545,12 @@ public synchronized void clearSession(final Context context,
         }
 
         session.getDataHandler().removeListener(mLiveEventListener);
+        if (keyBackupStateListeners.get(session.getMyUserId()) != null) {
+            if (session.getCrypto() != null) {
+                session.getCrypto().getKeysBackup().removeListener(keyBackupStateListeners.get(session.getMyUserId()));
+            }
+            keyBackupStateListeners.remove(session.getMyUserId());
+        }
 
         ApiCallback<Void> callback = new SimpleApiCallback<Void>() {
             @Override
@@ -719,13 +740,49 @@ public void onRoomKeyRequestCancellation(IncomingRoomKeyRequestCancellation requ
                             KeyRequestHandler.getSharedInstance().handleKeyRequestCancellation(request);
                         }
                     });
+
+                    registerKeyBackupStateListener(session);
                 }
             }
         });
 
+
         return session;
     }
 
+    private void registerKeyBackupStateListener(MXSession session) {
+        if (session.getCrypto() != null) {
+            KeysBackup keysBackup = session.getCrypto().getKeysBackup();
+            final String matrixID = session.getMyUserId();
+            if (keyBackupStateListeners.get(matrixID) == null) {
+                KeysBackupStateManager.KeysBackupStateListener keyBackupStateListener = new KeysBackupStateManager.KeysBackupStateListener() {
+                    @Override
+                    public void onStateChange(@NotNull KeysBackupStateManager.KeysBackupState newState) {
+                        if (KeysBackupStateManager.KeysBackupState.WrongBackUpVersion == newState) {
+                            //We should show the popup
+                            Activity activity = VectorApp.getCurrentActivity();
+                            //This is fake multi session :/ i should be able to have current session...
+                            if (activity != null) {
+                                new AlertDialog.Builder(activity)
+                                        .setTitle(R.string.new_recovery_method_popup_title)
+                                        .setMessage(R.string.new_recovery_method_popup_description)
+                                        .setPositiveButton(R.string.open_settings, (dialog, which) -> {
+                                            activity.startActivity(KeysBackupManageActivity.Companion.intent(activity, matrixID));
+                                        })
+                                        .setNegativeButton(R.string.new_recovery_method_popup_was_me, null)
+                                        .show();
+                            }
+                        }
+                    }
+                };
+                keyBackupStateListeners.put(matrixID, keyBackupStateListener);
+            }
+            keysBackup.addListener(keyBackupStateListeners.get(matrixID));
+        } else {
+            Log.e(LOG_TAG, "## Failed to register keybackup state listener");
+        }
+    }
+
     /**
      * Reload the matrix sessions.
      * The session caches are cleared before being reloaded.

vector/src/main/java/im/vector/Matrix.java

@@ -66,8 +66,10 @@ public class PhoneNumberHandler implements TextWatcher, View.OnFocusChangeListen
      * *********************************************************************************************
      */
 
-    public PhoneNumberHandler(@NonNull final Activity activity, @NonNull final EditText phoneNumberInput,
-                              @NonNull final EditText countryCodeInput, @DisplayMode final int displayMode,
+    public PhoneNumberHandler(@NonNull final Activity activity,
+                              @NonNull final EditText phoneNumberInput,
+                              @NonNull final EditText countryCodeInput,
+                              @DisplayMode final int displayMode,
                               final int requestCode) {
         mPhoneNumberInput = phoneNumberInput;
         mCountryCodeInput = countryCodeInput;

vector/src/main/java/im/vector/PhoneNumberHandler.java

@@ -184,6 +184,11 @@ public void run() {
             public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
                 super.onReceivedHttpError(view, request, errorResponse);
 
+                if (request.getUrl().toString().endsWith("favicon.ico")) {
+                    // Ignore this error
+                    return;
+                }
+
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     onError(errorResponse.getReasonPhrase());
                 } else {

vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java

@@ -336,13 +336,12 @@ public static void logout(final Activity activity, final boolean goToLoginPage)
             // display a dummy activity until the logout is done
             Matrix.getInstance(context).getPushManager().clearPreferences();
 
+            Intent intent = new Intent(activity, LoggingOutActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
             if (null != activity) {
-                // go to login page
-                activity.startActivity(new Intent(activity, LoggingOutActivity.class));
-                activity.finish();
+                activity.startActivity(intent);
             } else {
-                Intent intent = new Intent(context, LoggingOutActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                 context.startActivity(intent);
             }
         }
@@ -365,13 +364,14 @@ public void onSuccess(Void info) {
 
                 if (goToLoginPage) {
                     Activity activeActivity = VectorApp.getCurrentActivity();
+
+                    // go to login page
+                    Intent intent = new Intent(activeActivity, LoginActivity.class);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
                     if (null != activeActivity) {
-                        // go to login page
-                        activeActivity.startActivity(new Intent(activeActivity, LoginActivity.class));
-                        activeActivity.finish();
+                        activeActivity.startActivity(intent);
                     } else {
-                        Intent intent = new Intent(context, LoginActivity.class);
-                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                         context.startActivity(intent);
                     }
                 }

vector/src/main/java/im/vector/activity/CommonActivityUtils.java

@@ -37,7 +37,7 @@ class KeysBackupManageActivity : SimpleFragmentActivity() {
         }
     }
 
-    override fun getTitleRes() = R.string.title_activity_keys_backup_manage
+    override fun getTitleRes() = R.string.encryption_message_recovery
 
 
     private lateinit var viewModel: KeysBackupSettingsViewModel