gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid file storage permission warning.

Browse Source 
"Sharing files from storage is not possible without permission" popped up after app startup because notification permission was requested.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-08-23 14:35:53 +02:00
parent e60c2b4cc1
commit 68bf1ba7f2
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View File

@ -956,9 +956,11 @@ class ConversationsListActivity :
selectedMessageId = messageItem.messageEntry.messageId selectedMessageId = messageItem.messageEntry.messageId
showConversationByToken(conversationToken) showConversationByToken(conversationToken)
} }
LoadMoreResultsItem.VIEW_TYPE -> { LoadMoreResultsItem.VIEW_TYPE -> {
loadMoreMessages() loadMoreMessages()
} }
ConversationItem.VIEW_TYPE -> { ConversationItem.VIEW_TYPE -> {
handleConversation((Objects.requireNonNull(item) as ConversationItem).model) handleConversation((Objects.requireNonNull(item) as ConversationItem).model)
} }
@ -1172,10 +1174,8 @@ class ConversationsListActivity :
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) { override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults) super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION && if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION) {
grantResults.isNotEmpty() && if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
grantResults[0] == PackageManager.PERMISSION_GRANTED
) {
Log.d(TAG, "upload starting after permissions were granted") Log.d(TAG, "upload starting after permissions were granted")
showSendFilesConfirmDialog() showSendFilesConfirmDialog()
} else { } else {
@ -1183,6 +1183,7 @@ class ConversationsListActivity :
.show() .show()
} }
} }
}
private fun openConversation(textToPaste: String? = "") { private fun openConversation(textToPaste: String? = "") {
if (CallActivity.active && if (CallActivity.active &&
@ -1219,6 +1220,7 @@ class ConversationsListActivity :
EventStatus.EventType.CONVERSATION_UPDATE -> if (eventStatus.isAllGood && !isRefreshing) { EventStatus.EventType.CONVERSATION_UPDATE -> if (eventStatus.isAllGood && !isRefreshing) {
fetchRooms() fetchRooms()
} }
else -> {} else -> {}
} }
} }
@ -1495,7 +1497,9 @@ class ConversationsListActivity :
filterState[FilterConversationFragment.UNREAD] = unread filterState[FilterConversationFragment.UNREAD] = unread
} }
fun setFilterableItems(items: MutableList<AbstractFlexibleItem<*>>) { filterableConversationItems = items } fun setFilterableItems(items: MutableList<AbstractFlexibleItem<*>>) {
filterableConversationItems = items
}
fun updateFilterConversationButtonColor() { fun updateFilterConversationButtonColor() {
if (filterState.containsValue(true)) { if (filterState.containsValue(true)) {