diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index 670fe82f69..f32869e774 100644 --- 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 index 08f19bfbfb..7c9ae32e28 100755 --- 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 index 9be0ecd054..034327a639 100644 --- 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 index f6ec67477f..94e42b7e65 100644 --- 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/vector/src/withpinning/res/xml/network_security_config.xml b/vector/src/fdroid/withpinning/res/xml/network_security_config.xml similarity index 86% rename from vector/src/withpinning/res/xml/network_security_config.xml rename to vector/src/fdroid/withpinning/res/xml/network_security_config.xml index 5078cd149b..105c36a27a 100644 --- a/vector/src/withpinning/res/xml/network_security_config.xml +++ b/vector/src/fdroid/withpinning/res/xml/network_security_config.xml @@ -6,7 +6,7 @@ - + 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 index e96c603e60..a466ebe6da 100644 --- 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 new file mode 100644 index 0000000000..2aea413b18 --- /dev/null +++ b/vector/src/gplay/withpinning/res/xml/network_security_config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + firebaseinstallations.googleapis.com + + + + + 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 index 4b8357a079..edf13d1da9 100644 --- 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 { - 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/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt index 64cc5a21ad..0238cde093 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt +++ b/vector/src/main/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 index b5ac50a090..f30a7263f7 100644 --- a/vector/src/main/res/drawable/ic_tchap_forum.xml +++ b/vector/src/main/res/drawable/ic_tchap_forum.xml @@ -1,9 +1,10 @@ + android:width="13dp" + android:height="14dp" + android:viewportWidth="13" + android:viewportHeight="14"> - + 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"/> + \ No newline at end of file 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 deleted file mode 100644 index 9b6829a48f..0000000000 --- a/vector/src/main/res/drawable/ic_tchap_room_lock_grey.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/vector/src/main/res/layout/item_tchap_room.xml b/vector/src/main/res/layout/item_tchap_room.xml index eb55091612..daadbec461 100644 --- 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 index f739a3b4d5..d29daf533c 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -61,7 +61,6 @@ Externe - PrivĂ© Salon privĂ© Externes Salon privĂ© ouvert aux externes @@ -162,7 +161,7 @@ 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. - ${app_name} ne supporte pas encore les appels + ${app_name} ne supporte pas les appels Inviter Ă  rejoindre ${app_name} diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index 9f62302b6a..753615e0ca 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -62,7 +62,6 @@ External - Private Private room External Private room opened to externals @@ -163,7 +162,7 @@ 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. - ${app_name} does not support calls yet + ${app_name} does not support calls Invite to join ${app_name}