From 7852fc9e30653b29fb7a1db9dec6c72de8bc3e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Thu, 2 Dec 2021 12:45:37 +0100 Subject: [PATCH 1/2] Don't mirror check icon in RTL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The check icon for selection in the contact listwas inverted. Now correct orientation (✅) is used in LTR and RTL. Signed-off-by: Tim Krüger --- app/src/main/res/drawable/ic_check_black_24dp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml index 180854d6f..b25ac49ef 100644 --- a/app/src/main/res/drawable/ic_check_black_24dp.xml +++ b/app/src/main/res/drawable/ic_check_black_24dp.xml @@ -18,7 +18,7 @@ ~ along with this program. If not, see . --> - From 567326da5a86c828b92ce09746e13a269dda34e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Thu, 2 Dec 2021 12:54:26 +0100 Subject: [PATCH 2/2] Resolve klint issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tim Krüger --- .../talk/services/firebase/MagicFirebaseMessagingService.kt | 3 ++- .../main/java/com/nextcloud/talk/controllers/ChatController.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt index 9e23e1c7e..3d3cb9000 100644 --- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt +++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt @@ -341,7 +341,8 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() { if (hasParticipantsInCall) { for (participant in participantList) { if (participant.actorId == signatureVerification.userEntity.userId && - participant.actorType == Participant.ActorType.USERS) { + participant.actorType == Participant.ActorType.USERS + ) { inCallOnDifferentDevice = true break } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index d314a82d5..07d593990 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -323,7 +323,8 @@ class ChatController(args: Bundle) : override fun onNext(roomOverall: RoomOverall) { currentConversation = roomOverall.ocs.data Log.d( - TAG, "getRoomInfo. token: " + currentConversation?.getToken() + + TAG, + "getRoomInfo. token: " + currentConversation?.getToken() + " sessionId: " + currentConversation?.sessionId ) loadAvatarForStatusBar()