Merge branch 'release/tchap_v2.0.0'

tchapgouv · Feb 16, 2022 · 6dd537b · 6dd537b
2 parents a12f2b4 + 644fb3a
commit 6dd537b
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 49 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,18 @@
+Changes in Tchap 2.0.0 (2022-02-16)
+===================================
+
+Improvements 🙌
+--------------
+ - Change string "Tchap ne supporte pas encore les appels" to "Tchap ne supporte pas les appels" ([#410](/~https://github.com/tchapgouv/tchap-android-v2/issues/410))
+ - [Room list] Update the font of the sender message ([#412](/~https://github.com/tchapgouv/tchap-android-v2/issues/412))
+ - Simplify the main Conversations page ([#417](/~https://github.com/tchapgouv/tchap-android-v2/issues/417))
+
+Bugfixes 🐛
+----------
+ - Fix the FCM token error breaking the push notifications ([#402](/~https://github.com/tchapgouv/tchap-android-v2/issues/402))
+ - Wrong display of the forum icon in Dark theme ([#429](/~https://github.com/tchapgouv/tchap-android-v2/issues/429))
+
+
 Changes in Tchap 1.99.5 (2022-02-09)
 ====================================
 

diff --git a/tools/release/sign_all_apks.sh b/tools/release/sign_all_apks.sh
@@ -41,7 +41,7 @@ do
   # Save hash in file: Checksum.txt
   resultSplit=(${result})
   newName="$(echo ${resultSplit[1]} | sed 's/.*\///')"
-  echo "SHA256(${newName})=${resultSplit[0]}" > ${PARAM_DIRECTORY}/${CHECKSUM_FILE}
+  echo "SHA256(${newName})=${resultSplit[0]}" >> ${PARAM_DIRECTORY}/${CHECKSUM_FILE}
 done
 
 echo "done !! :)"
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "1.99.5"
+    version = "2.0.0"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector/build.gradle b/vector/build.gradle
@@ -13,9 +13,9 @@ kapt {
 }
 
 // Note: 2 digits max for each value
-ext.versionMajor = 1
-ext.versionMinor = 99
-ext.versionPatch = 5
+ext.versionMajor = 2
+ext.versionMinor = 0
+ext.versionPatch = 0
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/...nning/res/xml/network_security_config.xml → ...nning/res/xml/network_security_config.xml b/...nning/res/xml/network_security_config.xml → ...nning/res/xml/network_security_config.xml
@@ -6,7 +6,7 @@
             <!-- Do not allow system and user certificates -->
 
             <!-- Allow only Tchap intermediate certificate authority -->
-            <certificates src="@raw/certignaservicesrootca"/>
+            <certificates src="@raw/certignaservicesrootca" />
         </trust-anchors>
     </base-config>
 </network-security-config>
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -49,7 +49,8 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         mgr.addTest(testPlayServices)
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
-        mgr.addTest(testPushFromPushGateway)
+      // Tchap:  Hide this verification, we can't call tchap server.
+//        mgr.addTest(testPushFromPushGateway)
         mgr.addTest(testNotification)
         return mgr
     }

diff --git a/vector/src/gplay/withpinning/res/xml/network_security_config.xml b/vector/src/gplay/withpinning/res/xml/network_security_config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <!-- Do not allow clearText traffic -->
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <!-- Do not allow system and user certificates by default -->
+
+            <!-- Allow only Tchap intermediate certificate authority -->
+            <certificates src="@raw/certignaservicesrootca" />
+        </trust-anchors>
+    </base-config>
+
+    <!-- Allow system certificates for firebase -->
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="false">firebaseinstallations.googleapis.com</domain>
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </domain-config>
+</network-security-config>
diff --git a/vector/src/main/java/fr/gouv/tchap/features/home/room/list/TchapRoomSummaryItem.kt b/vector/src/main/java/fr/gouv/tchap/features/home/room/list/TchapRoomSummaryItem.kt
@@ -123,22 +123,9 @@ abstract class TchapRoomSummaryItem : VectorEpoxyModel<TchapRoomSummaryItem.Hold
 
         holder.domainNameView.apply {
             when (roomType) {
-                TchapRoomType.DIRECT   -> {
-                    text = TchapUtils.getDomainFromDisplayName(matrixItem.getBestName())
-                    setTextColor(ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_secondary))
-                    resource = R.drawable.ic_tchap_room_lock_grey
-                    visibility = View.VISIBLE
-                }
-                TchapRoomType.PRIVATE  -> {
-                    text = holder.view.context.getString(R.string.tchap_room_private_room_type)
-                    setTextColor(ContextCompat.getColor(holder.view.context, R.color.tchap_room_private))
-                    resource = R.drawable.ic_tchap_room_lock_red_bordered
-                    visibility = View.VISIBLE
-                }
                 TchapRoomType.EXTERNAL -> {
                     text = holder.view.context.getString(R.string.tchap_room_extern_room_type)
                     setTextColor(ContextCompat.getColor(holder.view.context, R.color.tchap_room_external))
-                    resource = R.drawable.ic_tchap_room_lock_orange_bordered
                     visibility = View.VISIBLE
                 }
                 TchapRoomType.FORUM    -> {

diff --git a/...java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/...java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -144,7 +144,6 @@ class DisplayableEventFormatter @Inject constructor(
             span {
                 text = senderName
                 textColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)
-                textStyle = "bold"
             }
                     .append(stringProvider.getString(R.string.tchap_colon_append))
                     .append(" ")

diff --git a/vector/src/main/res/drawable/ic_tchap_forum.xml b/vector/src/main/res/drawable/ic_tchap_forum.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="12dp"
-    android:viewportWidth="12"
-    android:viewportHeight="12">
+    android:width="13dp"
+    android:height="14dp"
+    android:viewportWidth="13"
+    android:viewportHeight="14">
   <path
-      android:pathData="M0.8509,1.7581C0.8509,1.2058 1.2986,0.7581 1.8508,0.7581C7.0718,0.7581 11.3043,4.9905 11.3043,10.2115C11.3043,10.7638 10.8566,11.2115 10.3043,11.2115C9.752,11.2115 9.3043,10.7638 9.3043,10.2115C9.3043,6.0951 5.9673,2.7581 1.8508,2.7581C1.2986,2.7581 0.8509,2.3104 0.8509,1.7581ZM0.8509,5.4884C0.8509,4.9361 1.2986,4.4884 1.8508,4.4884C5.0444,4.4884 7.6333,7.0773 7.6333,10.2709C7.6333,10.8231 7.1856,11.2709 6.6333,11.2709C6.0811,11.2709 5.6333,10.8231 5.6333,10.2709C5.6333,8.1818 3.9399,6.4884 1.8508,6.4884C1.2986,6.4884 0.8509,6.0406 0.8509,5.4884ZM1.2735,8.2889C2.739,8.2889 3.9269,9.4769 3.9269,10.9424H1.2405L1.2735,8.2889Z"
-      android:fillColor="@color/tchap_room_forum" />
-</vector>
+      android:pathData="M6.5636,1.4428C6.417,1.3974 6.2615,1.373 6.1007,1.373C5.2329,1.373 4.5207,2.0832 4.5207,2.9702V4.353H4.5199V5.0394H7.5304L1.9341,9.3921V5.3215C1.9341,5.1657 2.0604,5.0394 2.2162,5.0394H3.1471V2.97C3.1471,1.3346 4.4642,0 6.0999,0C6.4051,0 6.6992,0.0465 6.9758,0.1327C8.1815,0.5083 9.0532,1.6397 9.0532,2.9702V3.855L7.6797,4.9233V2.97C7.6797,2.2476 7.2074,1.6426 6.5636,1.4428ZM10.2672,6.1434L12.3348,4.5352L11.5471,3.5225L0,12.5035L0.7877,13.5163L3.4277,11.463H9.9851C10.1409,11.463 10.2672,11.3367 10.2672,11.1809L10.2672,6.1434Z"
+      android:fillColor="#2CCE70"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_tchap_room_lock_grey.xml b/vector/src/main/res/drawable/ic_tchap_room_lock_grey.xml
diff --git a/vector/src/main/res/layout/item_tchap_room.xml b/vector/src/main/res/layout/item_tchap_room.xml
@@ -66,7 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/room_encrypted"
-        android:src="@drawable/ic_tchap_room_lock_grey"
+        android:paddingTop="6dp"
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="30dp"

diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml
@@ -61,7 +61,6 @@
     <string name="tchap_contact_external">Externe</string>
 
     <!-- tchap room -->
-    <string name="tchap_room_private_room_type">Privé</string>
     <string name="tchap_room_long_private_room_type">Salon privé</string>
     <string name="tchap_room_extern_room_type">Externes</string>
     <string name="tchap_room_long_extern_room_type">Salon privé ouvert aux externes</string>
@@ -162,7 +161,7 @@
     <string name="tchap_action_sign_out_confirmation">Pour des raisons de sécurité, la déconnexion supprimera toutes les clés de chiffrement de bout en bout, rendant l’historique des conversations chiffrées inaccessible lorsque vous vous reconnecterez. Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
 
     <!-- Call -->
-    <string name="template_tchap_call_not_supported">${app_name} ne supporte pas encore les appels</string>
+    <string name="template_tchap_call_not_supported">${app_name} ne supporte pas les appels</string>
 
     <!-- Home drawer -->
     <string name="template_tchap_invite_to">Inviter à rejoindre ${app_name}</string>

diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml
@@ -62,7 +62,6 @@
     <string name="tchap_contact_external">External</string>
 
     <!-- tchap room -->
-    <string name="tchap_room_private_room_type">Private</string>
     <string name="tchap_room_long_private_room_type">Private room</string>
     <string name="tchap_room_extern_room_type">External</string>
     <string name="tchap_room_long_extern_room_type">Private room opened to externals</string>
@@ -163,7 +162,7 @@
     <string name="tchap_action_sign_out_confirmation">For security, logging out will delete any end-to-end encryption keys making previous encrypted chat history unreadable if you log back in.\nSelect export to backup them before signing out.</string>
 
     <!-- Call -->
-    <string name="template_tchap_call_not_supported">${app_name} does not support calls yet</string>
+    <string name="template_tchap_call_not_supported">${app_name} does not support calls</string>
 
     <!-- Home drawer -->
     <string name="template_tchap_invite_to">Invite to join ${app_name}</string>