Merge branch 'release/tchap_v1.0.47'

tchapgouv · Oct 7, 2020 · 6af1bf8 · 6af1bf8
2 parents 21405e4 + 5f582e6
commit 6af1bf8
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 11 deletions.
diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst
@@ -1,4 +1,13 @@
-Changes in Tchap 1.0.46 (2020-09-26)
+Changes in Tchap 1.0.47 (2020-10-02)
+===================================================
+
+Bug Fixes:
+ * Configure correctly activity launchmode PR #630
+ * Fix searchview cursor color PR #633
+ * fix crash loop back off on invalid access token #636
+ * [Expired Account] Tchap is stuck on the splash screen whereas the account is renewed #639
+
+ Changes in Tchap 1.0.46 (2020-09-26)
 ===================================================
 
 Improvements:

diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 71
-    versionNameProp = "1.0.46"
+    versionCodeProp = 72
+    versionNameProp = "1.0.47"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
@@ -87,7 +87,9 @@
         <activity
             android:name="fr.gouv.tchap.activity.NotificationListenerDetectionActivity"
             android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar.Swipe.Dark">
+            android:theme="@style/AppTheme.NoActionBar.Swipe.Dark"
+            android:launchMode="singleTask"
+            android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
@@ -258,7 +258,7 @@ public static void onApplicationStarted(Activity activity) {
         PreferenceManager.getDefaultSharedPreferences(activity)
                 .edit()
                 .putBoolean(RESTART_IN_PROGRESS_KEY, false)
-                .apply();
+                .commit();
     }
 
 
@@ -285,7 +285,7 @@ public static void restartApp(Context activity, boolean invalidatedCredentials)
             preferences
                     .edit()
                     .putBoolean(RESTART_IN_PROGRESS_KEY, true)
-                    .apply();
+                    .commit();
 
             Intent loginIntent = new Intent(activity, TchapLoginActivity.class);
             if (invalidatedCredentials) {

diff --git a/vector/src/main/java/im/vector/services/EventStreamServiceX.kt b/vector/src/main/java/im/vector/services/EventStreamServiceX.kt
@@ -164,7 +164,7 @@ class EventStreamServiceX : VectorService() {
         }
         val action = intent.action
 
-        Log.i(LOG_TAG, "onStartCommand with action : $action (current state $serviceState)")
+        Log.i(LOG_TAG, "onStartCommand with action : $action (current state $serviceState) $this")
 
         // Manage foreground notification
         when (action) {
@@ -220,9 +220,17 @@ class EventStreamServiceX : VectorService() {
                     EventStreamServiceX.ServiceState.CATCHUP ->
                         // A push has been received before, just change state, to avoid stopping the service when catchup is over
                         serviceState = ServiceState.STARTED
-                    EventStreamServiceX.ServiceState.STARTED -> {
-                        // Nothing to do
-                    }
+                    EventStreamServiceX.ServiceState.STARTED ->
+                        // Force a restart if the currentSyncToken is null whereas the store is ready.
+                        // This means the service is not correctly started because the syncToken should
+                        // be updated as soon as the event stream is started (This case is observed when
+                        // the account has expired).
+                        if (null == mSession?.currentSyncToken && mSession?.dataHandler?.store?.isReady ?: false) {
+                            mSession!!.stopEventStream()
+                            mSession!!.dataHandler.removeListener(mEventsListener)
+                            CallsManager.getSharedInstance().removeSession(mSession)
+                            start(false)
+                        }
                 }
             }
             ACTION_STOP,

diff --git a/vector/src/main/res/layout/activity_home.xml b/vector/src/main/res/layout/activity_home.xml
@@ -35,7 +35,8 @@
                 android:layout_marginTop="12dp"
                 android:background="@drawable/tchap_search_field"
                 android:clickable="true"
-                android:textAlignment="center" />
+                android:textAlignment="center"
+                android:theme="@style/Toolbar.SearchView.Light"/>
         </androidx.appcompat.widget.Toolbar>
 
         <com.google.android.material.tabs.TabLayout

diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
@@ -198,6 +198,10 @@
         <item name="editTextColor">@android:color/white</item>
         <item name="android:editTextColor">@android:color/white</item>
         <item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
+    </style>
+
+    <!-- toolbar searchview -->
+    <style name="Toolbar.SearchView.Light" parent="Widget.AppCompat.SearchView">
         <item name="colorControlActivated">@android:color/white</item>
     </style>