From 68bf1ba7f2ea3d9cc506c902e7b4b34caa8faa0a Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 23 Aug 2023 14:35:53 +0200 Subject: [PATCH 1/2] avoid file storage permission warning. "Sharing files from storage is not possible without permission" popped up after app startup because notification permission was requested. Signed-off-by: Marcel Hibbe --- .../ConversationsListActivity.kt | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index eb1caa8c4..9d07a2d80 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -956,9 +956,11 @@ class ConversationsListActivity : selectedMessageId = messageItem.messageEntry.messageId showConversationByToken(conversationToken) } + LoadMoreResultsItem.VIEW_TYPE -> { loadMoreMessages() } + ConversationItem.VIEW_TYPE -> { handleConversation((Objects.requireNonNull(item) as ConversationItem).model) } @@ -1172,15 +1174,14 @@ class ConversationsListActivity : override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) - if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION && - grantResults.isNotEmpty() && - grantResults[0] == PackageManager.PERMISSION_GRANTED - ) { - Log.d(TAG, "upload starting after permissions were granted") - showSendFilesConfirmDialog() - } else { - Snackbar.make(binding.root, context.getString(R.string.read_storage_no_permission), Snackbar.LENGTH_LONG) - .show() + if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION) { + if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + Log.d(TAG, "upload starting after permissions were granted") + showSendFilesConfirmDialog() + } else { + Snackbar.make(binding.root, context.getString(R.string.read_storage_no_permission), Snackbar.LENGTH_LONG) + .show() + } } } @@ -1219,6 +1220,7 @@ class ConversationsListActivity : EventStatus.EventType.CONVERSATION_UPDATE -> if (eventStatus.isAllGood && !isRefreshing) { fetchRooms() } + else -> {} } } @@ -1495,7 +1497,9 @@ class ConversationsListActivity : filterState[FilterConversationFragment.UNREAD] = unread } - fun setFilterableItems(items: MutableList>) { filterableConversationItems = items } + fun setFilterableItems(items: MutableList>) { + filterableConversationItems = items + } fun updateFilterConversationButtonColor() { if (filterState.containsValue(true)) { From bc425bc0d3801e76af3f5f1c076e078f8bd7046e Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 24 Aug 2023 09:45:57 +0200 Subject: [PATCH 2/2] apply changes by ktlintFormat Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/activities/CallActivity.kt | 11 +++++++---- .../java/com/nextcloud/talk/chat/ChatActivity.kt | 16 ++++++++++------ .../conversationinfo/ConversationInfoActivity.kt | 6 ++++-- .../talk/conversationinfo/GuestAccessHelper.kt | 6 ++++-- .../ConversationsListActivity.kt | 7 +++++-- .../nextcloud/talk/jobs/NotificationWorker.kt | 9 +++++---- 6 files changed, 35 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 9728225cc..c86b080c1 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -430,7 +430,8 @@ class CallActivity : CallBaseActivity() { Snackbar.make( binding!!.root, context.resources.getString(R.string.record_active_info), - Snackbar.LENGTH_LONG).show() + Snackbar.LENGTH_LONG + ).show() } } else if (viewState is RecordingStartingState) { if (isAllowedToStartOrStopRecording) { @@ -614,9 +615,11 @@ class CallActivity : CallBaseActivity() { callRecordingViewModel!!.clickRecordButton() } } else { - Snackbar.make(binding!!.root, context.resources.getString(R.string.record_active_info), Snackbar - .LENGTH_LONG) - .show() + Snackbar.make( + binding!!.root, + context.resources.getString(R.string.record_active_info), + Snackbar.LENGTH_LONG + ).show() } } binding!!.lowerHandButton.setOnClickListener { l: View? -> raiseHandViewModel!!.lowerHand() } diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 4486144e3..aa4e7ee3b 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -2366,16 +2366,20 @@ class ChatActivity : } } catch (e: IllegalStateException) { context.resources?.getString(R.string.nc_upload_failed)?.let { - Snackbar.make(binding.root, it, Snackbar - .LENGTH_LONG) - .show() + Snackbar.make( + binding.root, + it, + Snackbar.LENGTH_LONG + ).show() } Log.e(javaClass.simpleName, "Something went wrong when trying to upload file", e) } catch (e: IllegalArgumentException) { context.resources?.getString(R.string.nc_upload_failed)?.let { - Snackbar.make(binding.root, it, Snackbar - .LENGTH_LONG) - .show() + Snackbar.make( + binding.root, + it, + Snackbar.LENGTH_LONG + ).show() } Log.e(javaClass.simpleName, "Something went wrong when trying to upload file", e) } diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 09803559d..631db4239 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -594,9 +594,11 @@ class ConversationInfoActivity : } override fun onNext(genericOverall: GenericOverall) { - Snackbar.make(binding.root, + Snackbar.make( + binding.root, context.getString(R.string.nc_clear_history_success), - Snackbar.LENGTH_LONG).show() + Snackbar.LENGTH_LONG + ).show() } override fun onError(e: Throwable) { diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt index b0c6aa665..4ec42f0ea 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt @@ -151,9 +151,11 @@ class GuestAccessHelper( override fun onComplete() { if (resendInvitationsResult.successful) { - Snackbar.make(binding.root, + Snackbar.make( + binding.root, R.string.nc_guest_access_resend_invitations_successful, - Snackbar.LENGTH_SHORT).show() + Snackbar.LENGTH_SHORT + ).show() } } } diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 9d07a2d80..ce2766d6a 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -1179,8 +1179,11 @@ class ConversationsListActivity : Log.d(TAG, "upload starting after permissions were granted") showSendFilesConfirmDialog() } else { - Snackbar.make(binding.root, context.getString(R.string.read_storage_no_permission), Snackbar.LENGTH_LONG) - .show() + Snackbar.make( + binding.root, + context.getString(R.string.read_storage_no_permission), + Snackbar.LENGTH_LONG + ).show() } } } diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt index 44c7407d6..59a5a441a 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt @@ -329,8 +329,11 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor Log.e(TAG, "Failed to get NC notification", e) if (BuildConfig.DEBUG) { Handler(Looper.getMainLooper()).post { - Snackbar.make(View(applicationContext), "Failed to get NC notification", Snackbar - .LENGTH_LONG).show() + Snackbar.make( + View(applicationContext), + "Failed to get NC notification", + Snackbar.LENGTH_LONG + ).show() } } } @@ -744,7 +747,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor Manifest.permission.POST_NOTIFICATIONS ) != PackageManager.PERMISSION_GRANTED ) { - // here to request the missing permissions, and then overriding // public void onRequestPermissionsResult(int requestCode, String[] permissions, // int[] grantResults) @@ -925,7 +927,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor Manifest.permission.POST_NOTIFICATIONS ) != PackageManager.PERMISSION_GRANTED ) { - // here to request the missing permissions, and then overriding // public void onRequestPermissionsResult(int requestCode, String[] permissions, // int[] grantResults)