Merge branch 'release/0.8.14'

Author: bmarty

CHANGES.rst

@@ -1,3 +1,28 @@
+Changes in Riot 0.8.14 (2018-08-27)
+===================================================
+
+MatrixSdk:
+ - Upgrade to version 0.9.8.
+
+Features:
+ - Manage server quota notices (#2440)
+
+Improvements:
+ - Do not ask permission to write external storage at startup (#2483)
+ - Update settings icon and transparent logo for notifications and navigation drawer (#2492)
+ - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514)
+ - Fix some plural and puzzle strings, and remove other unused ones (#2444)
+ - Manage System Alerts in a dedicated section
+
+Other changes:
+ - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0
+ - move PieFractionView from the SDK to the client (#2525)
+
+Bugfix:
+ - Fix media sharing (#2530)
+ - Fix notification sound issue in settings (#2524)
+ - Disable app icon badge for "listen for event" notification (#2104)
+
 Changes in Riot 0.8.13 (2018-08-09)
 ===================================================
 

build.gradle

@@ -19,8 +19,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 81300
-    versionNameProp = "0.8.13"
+    versionCodeProp = 81400
+    versionNameProp = "0.8.14"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

vector/libs/matrix-sdk.aar

@@ -151,6 +151,11 @@ public void getSupportedLoginFlows(Context ctx, final HomeServerConnectionConfig
         LoginRestClient client = new LoginRestClient(hsConfig);
 
         client.getSupportedLoginFlows(new UnrecognizedCertApiCallback<List<LoginFlow>>(hsConfig, callback) {
+            @Override
+            public void onSuccess(List<LoginFlow> info) {
+                callback.onSuccess(info);
+            }
+
             @Override
             public void onAcceptedCert() {
                 getSupportedLoginFlows(appCtx, hsConfig, callback);
@@ -221,6 +226,11 @@ public void submitEmailTokenValidation(final Context aCtx,
         ThirdPidRestClient restClient = new ThirdPidRestClient(aHomeServerConfig);
 
         pid.submitValidationToken(restClient, aToken, aClientSecret, aSid, new UnrecognizedCertApiCallback<Boolean>(aHomeServerConfig, aRespCallback) {
+            @Override
+            public void onSuccess(Boolean info) {
+                aRespCallback.onSuccess(info);
+            }
+
             @Override
             public void onAcceptedCert() {
                 submitEmailTokenValidation(aCtx, aHomeServerConfig, aToken, aClientSecret, aSid, aRespCallback);

vector/libs/olm-sdk.aar

@@ -215,6 +215,12 @@ public void onRegistrationSuccess() {
                 public void onRegistrationFailed(String message) {
                     listener.onUsernameAvailabilityChecked(!TextUtils.equals(MatrixError.USER_IN_USE, message));
                 }
+
+                @Override
+                public void onResourceLimitExceeded(MatrixError e) {
+                    // Should not happen, consider user is available, registration will fail later on
+                    listener.onUsernameAvailabilityChecked(true);
+                }
             });
         }
     }
@@ -353,6 +359,11 @@ public void onRegistrationFailed(String message) {
                         listener.onRegistrationFailed(message);
                     }
                 }
+
+                @Override
+                public void onResourceLimitExceeded(MatrixError e) {
+                    listener.onResourceLimitExceeded(e);
+                }
             });
         }
     }
@@ -402,6 +413,11 @@ public void onRegistrationFailed(String message) {
                     listener.onRegistrationFailed(message);
                 }
             }
+
+            @Override
+            public void onResourceLimitExceeded(MatrixError e) {
+                listener.onResourceLimitExceeded(e);
+            }
         });
     }
 
@@ -973,6 +989,8 @@ public void onMatrixError(MatrixError e) {
                             Log.e(LOG_TAG, "JsonUtils.toRegistrationFlowResponse " + castExcept.getLocalizedMessage(), castExcept);
                         }
                         listener.onRegistrationFailed(ERROR_MISSING_STAGE);
+                    } else if (TextUtils.equals(e.errcode, MatrixError.RESOURCE_LIMIT_EXCEEDED)) {
+                        listener.onResourceLimitExceeded(e);
                     } else {
                         listener.onRegistrationFailed("");
                     }
@@ -991,6 +1009,8 @@ private interface InternalRegistrationListener {
         void onRegistrationSuccess();
 
         void onRegistrationFailed(String message);
+
+        void onResourceLimitExceeded(MatrixError e);
     }
 
     /*
@@ -1023,5 +1043,7 @@ public interface RegistrationListener {
         void onWaitingCaptcha();
 
         void onThreePidRequestFailed(String message);
+
+        void onResourceLimitExceeded(MatrixError e);
     }
 }

vector/src/main/java/im/vector/LoginHandler.java

@@ -7,7 +7,7 @@
 /**
  * Handle certificate errors in API callbacks
  */
-public class UnrecognizedCertApiCallback<T> extends SimpleApiCallback<T> {
+public abstract class UnrecognizedCertApiCallback<T> extends SimpleApiCallback<T> {
 
     private HomeServerConnectionConfig mHsConfig;
     private ApiCallback mCallback;
@@ -27,9 +27,7 @@ public UnrecognizedCertApiCallback(HomeServerConnectionConfig hsConfig) {
      *
      * The usual behavior is to play the request again
      */
-    public void onAcceptedCert() {
-
-    }
+    public abstract void onAcceptedCert();
 
     /**
      * The request failed because of an unknown TLS certificate or a network error

vector/src/main/java/im/vector/RegistrationManager.java

@@ -25,7 +25,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -38,26 +37,17 @@
 import android.preference.PreferenceManager;
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Pair;
 
 import com.facebook.stetho.Stetho;
 
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.util.Log;
-import org.piwik.sdk.Piwik;
-import org.piwik.sdk.QueryParams;
-import org.piwik.sdk.TrackMe;
-import org.piwik.sdk.Tracker;
-import org.piwik.sdk.TrackerConfig;
-import org.piwik.sdk.extra.CustomVariables;
-import org.piwik.sdk.extra.TrackHelper;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -85,6 +75,7 @@
 import im.vector.services.EventStreamService;
 import im.vector.settings.FontScale;
 import im.vector.util.CallsManager;
+import im.vector.util.PermissionsToolsKt;
 import im.vector.util.PhoneNumberUtils;
 import im.vector.util.PreferencesManager;
 import im.vector.util.RageShake;
@@ -297,7 +288,7 @@ public void onActivityResumed(final Activity activity) {
                     restartActivity(activity);
                 }
 
-                listPermissionStatuses();
+                PermissionsToolsKt.logPermissionStatuses(VectorApp.this);
             }
 
             @Override
@@ -485,28 +476,6 @@ public void run() {
         }
     }
 
-
-    /**
-     * List the used permissions statuses.
-     */
-    private void listPermissionStatuses() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            final List<String> permissions = Arrays.asList(
-                    android.Manifest.permission.CAMERA,
-                    android.Manifest.permission.RECORD_AUDIO,
-                    android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                    android.Manifest.permission.READ_CONTACTS);
-
-            Log.d(LOG_TAG, "## listPermissionStatuses() : list the permissions used by the app");
-            for (String permission : permissions) {
-                Log.d(LOG_TAG, "Status of [" + permission + "] : " +
-                        ((PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(instance, permission)) ?
-                                "PERMISSION_GRANTED" : "PERMISSION_DENIED"));
-            }
-        }
-    }
-
-
     /**
      * Stop the background detection.
      */

vector/src/main/java/im/vector/UnrecognizedCertApiCallback.java

@@ -49,7 +49,7 @@ import java.util.*
  *
  * Layout MUST contains a WebView with ID 'widget_webview'
  */
-abstract class AbstractWidgetActivity : RiotAppCompatActivity() {
+abstract class AbstractWidgetActivity : VectorAppCompatActivity() {
 
     /* ==========================================================================================
      * UI

vector/src/main/java/im/vector/VectorApp.java

@@ -40,7 +40,7 @@
 /**
  * AccountCreationActivity is the fallback account creation activity
  */
-public class AccountCreationActivity extends RiotAppCompatActivity {
+public class AccountCreationActivity extends VectorAppCompatActivity {
     private static final String LOG_TAG = AccountCreationActivity.class.getSimpleName();
 
     public static final String EXTRA_HOME_SERVER_ID = "AccountCreationActivity.EXTRA_HOME_SERVER_ID";