Merge branch 'release/0.9.11'

Author: bmarty

CHANGES.rst

@@ -1,3 +1,24 @@
+Changes in Riot 0.9.11 (2020-XX-XX)
+===================================================
+
+MatrixSdk 🚀:
+ - Upgrade MatrixSdk to version 0.9.34.
+ - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.9.34
+
+Improvements 🙌:
+ - Remove the warning when using server discovery, it's too confusing for non-technical users (#3310)
+
+Other changes:
+ - Update Matomo app id (#3429)
+
+Bug fixes 🐛:
+ - Read Jitsi domain from server (#3443)
+ - some unused strings trimmed from repository to pass lint checks
+ - Fix issue with identity server missing token (#3404)
+
+Translations 🗣:
+ - String for RiotX has been removed from this project
+
 Changes in RiotX 0.9.10 (2019-02-10)
 ===================================================
 

build.gradle

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

gradle.properties

@@ -31,3 +31,5 @@ android.enableJetifier=true
 
 # To be able to analyse with sonar, put these variables in ~/.gradle/gradle.properties
 # SONAR_LOGIN=sonar_login
+
+org.gradle.jvmargs=-Xmx4096m

vector/build.gradle

@@ -245,7 +245,7 @@ dependencies {
     /************* Matrix SDK management **************/
     // update settings.gradle
     // use the matrix SDK as external dependency
-    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.33'
+    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.34'
     // use the matrix SDK as a sub project
     // you have to uncomment some lines in settings.gradle
     //implementation project(':matrix-sdk')

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

@@ -47,6 +47,7 @@
 import im.vector.widgets.Widget;
 import im.vector.widgets.WidgetManagerProvider;
 import im.vector.widgets.WidgetsManager;
+import im.vector.widgets.model.JitsiWidgetProperties;
 
 /**
  * Inspired from JitsiMeetActivity
@@ -64,17 +65,15 @@ public class JitsiCallActivity extends VectorAppCompatActivity implements JitsiM
      */
     public static final String EXTRA_ENABLE_VIDEO = "EXTRA_ENABLE_VIDEO";
 
-    /**
-     * Base server URL
-     */
-    public static final String JITSI_SERVER_URL = "https://jitsi.riot.im/";
-
     // the jitsi view
     private JitsiMeetView mJitsiView;
 
     // the linked widget
     private Widget mWidget = null;
 
+    // the linked widget's Jitsi info
+    private JitsiWidgetProperties mJitsi = null;
+
     // video call
     private boolean mIsVideoCall;
 
@@ -117,12 +116,13 @@ public void initUiAndData() {
         setWaitingView(findViewById(R.id.jitsi_progress_layout));
 
         mWidget = (Widget) getIntent().getSerializableExtra(EXTRA_WIDGET_ID);
+        mJitsi = new JitsiWidgetProperties(mWidget.getUrl());
         mIsVideoCall = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO, true);
 
         try {
             Uri uri = Uri.parse(mWidget.getUrl());
             String confId = uri.getQueryParameter("confId");
-            mCallUrl = JITSI_SERVER_URL + confId;
+            mCallUrl = "https://" + mJitsi.getDomain() + "/" + confId;
         } catch (Exception e) {
             Log.e(LOG_TAG, "## onCreate() failed : " + e.getMessage(), e);
             finish();
@@ -154,9 +154,15 @@ public void initUiAndData() {
     private void loadURL() {
         try {
             JitsiMeetUserInfo userInfo = new JitsiMeetUserInfo();
-            userInfo.setDisplayName(mSession.getMyUser().displayname);
+            final String displayName = mJitsi.getDisplayName();
+            userInfo.setDisplayName(
+                    displayName != null ? displayName :  mSession.getMyUser().displayname
+            );
             try {
-                String avatarUrl = mSession.getMyUser().avatar_url;
+                String avatarUrl = mJitsi.getAvatarUrl();
+                if (avatarUrl == null) {
+                    avatarUrl = mSession.getMyUser().avatar_url;
+                }
                 if (avatarUrl != null) {
                     String downloadableUrl = mSession.getContentManager().getDownloadableUrl(avatarUrl, false);
                     if (downloadableUrl != null) {

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

@@ -809,23 +809,24 @@ private void onAutoDiscoveryRetrieved(String domain, AutoDiscovery.DiscoveredCli
                             || !hs.equals(mHomeServerUrl)
                             || !ids.equals(mIdentityServerUrl)) {
                         String finalIds = ids;
-                        new AlertDialog.Builder(LoginActivity.this)
-                                .setTitle(getString(R.string.autodiscover_well_known_autofill_dialog_title))
-                                .setMessage(getString(R.string.autodiscover_well_known_autofill_dialog_message,
-                                        domain,
-                                        String.format("• %s\n• %s", hs, ids)))
-                                .setPositiveButton(getString(R.string.autodiscover_well_known_autofill_confirm), (dialog, which) -> {
-                                    mHomeServerText.setText(hs);
-                                    mIdentityServerText.setText(finalIds);
-                                    if (!mUseCustomHomeServersCheckbox.isChecked()) {
-                                        mUseCustomHomeServersCheckbox.performClick();
-                                    } else {
-                                        onHomeServerUrlUpdate(true);
-                                        onIdentityServerUrlUpdate(true);
-                                    }
-                                })
-                                .setNegativeButton(R.string.ignore, null)
-                                .show();
+                        // Remove the warning, it's too confusing for non-technical users (#3310)
+                        //new AlertDialog.Builder(LoginActivity.this)
+                        //        .setTitle(getString(R.string.autodiscover_well_known_autofill_dialog_title))
+                        //        .setMessage(getString(R.string.autodiscover_well_known_autofill_dialog_message,
+                        //                domain,
+                        //                String.format("• %s\n• %s", hs, ids)))
+                        //        .setPositiveButton(getString(R.string.autodiscover_well_known_autofill_confirm), (dialog, which) -> {
+                        mHomeServerText.setText(hs);
+                        mIdentityServerText.setText(finalIds);
+                        if (!mUseCustomHomeServersCheckbox.isChecked()) {
+                            mUseCustomHomeServersCheckbox.performClick();
+                        } else {
+                            onHomeServerUrlUpdate(true);
+                            onIdentityServerUrlUpdate(true);
+                        }
+                        //       })
+                        //       .setNegativeButton(R.string.ignore, null)
+                        //       .show();
                     }
                 }
             }

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

@@ -19,7 +19,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -40,7 +39,6 @@
 import org.matrix.androidsdk.core.Log;
 import org.matrix.androidsdk.core.callback.ApiCallback;
 import org.matrix.androidsdk.core.model.MatrixError;
-import org.matrix.androidsdk.features.identityserver.IdentityServerManager;
 import org.matrix.androidsdk.rest.model.pid.ThreePid;
 
 import im.vector.Matrix;
@@ -263,7 +261,7 @@ private void addPhoneNumber(final Phonenumber.PhoneNumber phoneNumber) {
             final String countryCode = PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(phoneNumber.getCountryCode());
             final ThreePid pid = ThreePid.Companion.fromPhoneNumber(e164phone, countryCode);
 
-            mSession.getIdentityServerManager().startAddSessionForPhoneNumber(pid,null, new ApiCallback<ThreePid>() {
+            mSession.getIdentityServerManager().startAddSessionForPhoneNumber(pid, null, new ApiCallback<ThreePid>() {
                 @Override
                 public void onSuccess(ThreePid pid) {
                     hideWaitingView();

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

@@ -129,7 +129,6 @@
 import im.vector.util.ReadMarkerManager;
 import im.vector.util.RoomUtils;
 import im.vector.util.SlashCommandsParser;
-import im.vector.util.UrlUtilKt;
 import im.vector.util.VectorMarkdownParser;
 import im.vector.util.VectorRoomMediasSender;
 import im.vector.util.VectorUtils;
@@ -140,6 +139,7 @@
 import im.vector.view.VectorPendingCallView;
 import im.vector.widgets.Widget;
 import im.vector.widgets.WidgetsManager;
+import im.vector.widgets.model.JitsiWidgetProperties;
 import kotlin.Unit;
 
 /**
@@ -1769,8 +1769,9 @@ private void launchJitsiActivity(Widget widget, boolean aIsVideoCall) {
                     .show();
         } else {
             //Here check native widget perm
+            final JitsiWidgetProperties jitsi = new JitsiWidgetProperties(widget.getUrl());
 
-            String domain = UrlUtilKt.extractDomain(JitsiCallActivity.JITSI_SERVER_URL);
+            String domain = jitsi.getDomain();
             if (domain == null) return; //display a toast?
             boolean isAllowed = mSession.getIntegrationManager().isNativeWidgetAllowed("jitsi", domain);
             if (isAllowed) {

vector/src/main/java/im/vector/fragments/discovery/DiscoverySettingsViewModel.kt

@@ -242,7 +242,7 @@ class DiscoverySettingsViewModel(initialState: DiscoverySettingsState, private v
 
     fun revokeMsisdn(msisdn: String) = withState { state ->
         if (state.identityServer() == null) return@withState
-        if (state.emailList() == null) return@withState
+        if (state.phoneNumbersList() == null) return@withState
         changeMsisdnState(msisdn, Loading())
 
         val phoneNumber = PhoneNumberUtil.getInstance()

vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt

@@ -21,10 +21,9 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import im.vector.Matrix
 import im.vector.R
-import im.vector.activity.JitsiCallActivity
-import im.vector.util.extractDomain
 import im.vector.widgets.Widget
 import im.vector.widgets.WidgetsManager
+import im.vector.widgets.model.JitsiWidgetProperties
 import org.matrix.androidsdk.MXSession
 import org.matrix.androidsdk.core.callback.SimpleApiCallback
 import java.net.URL
@@ -121,7 +120,7 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
                         authorName = creator?.displayname,
                         authorId = widget.widgetEvent.sender,
                         authorAvatarUrl = creator?.getAvatarUrl(),
-                        widgetDomain = extractDomain(JitsiCallActivity.JITSI_SERVER_URL),
+                        widgetDomain = JitsiWidgetProperties(widget.url).domain,
                         permissionsList = infoShared
                 )