From b532e823a1c3ae2e5cf8e29df8b9a685460f9539 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 09:56:04 +0000 Subject: [PATCH 1/2] Bump gson from 2.8.6 to 2.8.7 Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.7. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.7) Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 055b2abb5..b707934dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -273,7 +273,7 @@ dependencies { implementation "com.afollestad.material-dialogs:bottomsheets:${materialDialogsVersion}" implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}" - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.code.gson:gson:2.8.7' implementation 'com.google.android.exoplayer:exoplayer:2.14.0' implementation 'com.github.chrisbanes:PhotoView:2.3.0' From 45ed897c34a0c5b386257fb1e5cd904adb9f3b9e Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 25 May 2021 12:23:30 +0200 Subject: [PATCH 2/2] reformat kotlin code Signed-off-by: Andy Scherzinger --- .../talk/controllers/ChatController.kt | 32 +++++++++++++------ .../talk/jobs/UploadAndShareFilesWorker.kt | 5 +-- 2 files changed, 25 insertions(+), 12 deletions(-) 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 416e39025..9a5bc22cd 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -615,7 +615,11 @@ class ChatController(args: Bundle) : private fun checkReadOnlyState() { if (currentConversation != null) { - if (currentConversation?.shouldShowLobby(conversationUser) ?: false || currentConversation?.conversationReadOnlyState != null && currentConversation?.conversationReadOnlyState == Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY) { + if (currentConversation?.shouldShowLobby(conversationUser) ?: false || + currentConversation?.conversationReadOnlyState != null && + currentConversation?.conversationReadOnlyState == + Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY + ) { conversationVoiceCallMenuItem?.icon?.alpha = 99 conversationVideoMenuItem?.icon?.alpha = 99 @@ -745,7 +749,10 @@ class ChatController(args: Bundle) : } override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { - if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION && grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION && + grantResults.isNotEmpty() && + grantResults[0] == PackageManager.PERMISSION_GRANTED + ) { Log.d(ConversationsListController.TAG, "upload starting after permissions were granted") uploadFiles(filesToUpload) } else { @@ -843,10 +850,11 @@ class ChatController(args: Bundle) : super.onAttach(view) eventBus?.register(this) - if (conversationUser?.userId != "?" && conversationUser?.hasSpreedFeatureCapability("mention-flag") ?: false && activity != null) { - activity?.findViewById(R.id.toolbar)?.setOnClickListener { v -> - showConversationInfoScreen() - } + if (conversationUser?.userId != "?" && + conversationUser?.hasSpreedFeatureCapability("mention-flag") ?: false && + activity != null + ) { + activity?.findViewById(R.id.toolbar)?.setOnClickListener { v -> showConversationInfoScreen() } } isLeavingForConversation = false @@ -1327,9 +1335,9 @@ class ChatController(args: Bundle) : TextUtils.isEmpty(chatMessageList[i + 1].systemMessage) && chatMessageList[i + 1].actorId == chatMessageList[i].actorId && countGroupedMessages < 4 && DateFormatter.isSameDay( - chatMessageList[i].createdAt, - chatMessageList[i + 1].createdAt - ) + chatMessageList[i].createdAt, + chatMessageList[i + 1].createdAt + ) ) { chatMessageList[i].isGrouped = true countGroupedMessages++ @@ -1373,7 +1381,11 @@ class ChatController(args: Bundle) : chatMessage.isLinkPreviewAllowed = isLinkPreviewAllowed val shouldScroll = - !isThereANewNotice && !shouldAddNewMessagesNotice && layoutManager?.findFirstVisibleItemPosition() == 0 || adapter != null && adapter?.itemCount == 0 + !isThereANewNotice && + !shouldAddNewMessagesNotice && + layoutManager?.findFirstVisibleItemPosition() == 0 || + adapter != null && + adapter?.itemCount == 0 if (!shouldAddNewMessagesNotice && !shouldScroll && popupBubble != null) { if (!popupBubble!!.isShown) { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt index 67df52a0d..f2d91f747 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt @@ -75,7 +75,8 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa if (!isStoragePermissionGranted(context)) { Log.w( - TAG, "Storage permission is not granted. As a developer please make sure you check for" + + TAG, + "Storage permission is not granted. As a developer please make sure you check for" + "permissions via UploadAndShareFilesWorker.isStoragePermissionGranted() and " + "UploadAndShareFilesWorker.requestStoragePermission() beforehand. If you already " + "did but end up with this warning, the user most likely revoked the permission" @@ -203,7 +204,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa Log.d(TAG, "Permission is revoked") return false } - } else { //permission is automatically granted on sdk<23 upon installation + } else { // permission is automatically granted on sdk<23 upon installation Log.d(TAG, "Permission is granted") return true }