New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix file access permission #1022

Merged

yostyle merged 10 commits into develop from yostyle/fix_image_permission

Apr 10, 2024

Contributor

yostyle commented Apr 8, 2024 •

edited

Loading

Type of change

Feature
Bugfix
Technical
Other :

Content

Fix #642 #766 #851 #911

Motivation and context

Screenshots / GIFs

Tests

Step 1
Step 2
Step ...

Tested devices

Physical
Emulator
OS version(s):

Checklist

Changes has been tested on an Android device or Android emulator with API 21
UI change has been tested on both light and dark themes
Accessibility has been taken into account. See https://github.com/tchapgouv/tchap-android/blob/develop/CONTRIBUTING.md#accessibility
Pull request is based on the develop branch
Pull request includes a new file under ./changelog.d. See https://github.com/tchapgouv/tchap-android/blob/develop/CONTRIBUTING.md#changelog
Pull request includes screenshots or videos if containing UI changes
Pull request includes a sign off
You've made a self review of your PR
If you have modified the screen flow, or added new screens to the application, you have updated the test UiAllScreensSanityTest.allScreensTest()

yostyle added 3 commits

April 4, 2024 12:57


          Fix coming images from xiaomi gallery

d64d442


          Fix access to selected local files

164ffec


          Revoke file read permission when event is cancelled

5dd88a5

yostyle requested a review from NicolasBuquet

April 8, 2024 19:40

yostyle self-assigned this

tchap-danger-bot bot commented Apr 8, 2024

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against 5dd88a5


          Fix lint

c432446

tchap-danger-bot bot commented Apr 8, 2024

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against c432446


          Remove unused code

64b5ffd

tchap-danger-bot bot commented Apr 8, 2024

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against 64b5ffd


          Fix camera picker permission

fb7fb84

tchap-danger-bot bot commented Apr 8, 2024

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against fb7fb84

yostyle changed the title ~~Yostyle/fix image permission~~ Fix file acces permission

yostyle changed the title ~~Fix file acces permission~~ Fix file access permission


          Fix lint

8341f46

tchap-danger-bot bot commented Apr 8, 2024

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against 8341f46

NicolasBuquet requested changes

View reviewed changes

Contributor

NicolasBuquet left a comment

Mutualiser la configuration de l'appel getSelectedUriList

library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt Outdated

@@ @@ -32,6 +32,8 @@ class AudioPicker : Picker<MultiPickerAudioType>() { @@
                    */
                   override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerAudioType> {
                       return getSelectedUriList(data).mapNotNull { selectedUri ->
+                          // Tchap: Grant permission to access the selected file.
+                          context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)

Contributor

NicolasBuquet Apr 9, 2024

Pourrais être mutualisé dans la classe parente multipicker/Picker::getSelectedUriList

library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt Outdated

@@ @@ -42,6 +42,9 @@ class FilePicker : Picker<MultiPickerBaseType>() { @@
                    */
                   override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseType> {
                       return getSelectedUriList(data).mapNotNull { selectedUri ->
+                          // Tchap: Grant permission to access the selected file.
+                          context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)

Contributor

NicolasBuquet Apr 9, 2024

Pourrais être mutualisé dans la classe parente multipicker/Picker::getSelectedUriList

library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt Outdated

@@ @@ -32,6 +32,8 @@ class ImagePicker : Picker<MultiPickerImageType>() { @@
                    */
                   override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerImageType> {
                       return getSelectedUriList(data).mapNotNull { selectedUri ->
+                          // Tchap: Grant permission to access the selected file.
+                          context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)

Contributor

NicolasBuquet Apr 9, 2024

Pourrais être mutualisé dans la classe parente multipicker/Picker::getSelectedUriList

library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt Outdated

@@ @@ -34,6 +34,9 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() { @@
                    */
                   override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseMediaType> {
                       return getSelectedUriList(data).mapNotNull { selectedUri ->
+                          // Tchap: Grant permission to access the selected file.
+                          context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)

Contributor

NicolasBuquet Apr 9, 2024

Pourrais être mutualisé dans la classe parente multipicker/Picker::getSelectedUriList

library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt Outdated

@@ @@ -32,6 +32,8 @@ class VideoPicker : Picker<MultiPickerVideoType>() { @@
                    */
                   override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerVideoType> {
                       return getSelectedUriList(data).mapNotNull { selectedUri ->
+                          // Tchap: Grant permission to access the selected file.
+                          context.grantUriPermission(context.applicationContext.packageName, selectedUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)

Contributor

NicolasBuquet Apr 9, 2024

Pourrais être mutualisé dans la classe parente multipicker/Picker::getSelectedUriList

vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt

@@ @@ -52,7 +52,7 @@ sealed class RoomDetailAction : VectorViewModelAction { @@
                   data class ResendMessage(val eventId: String) : RoomDetailAction()
                   data class RemoveFailedEcho(val eventId: String) : RoomDetailAction()
-                  data class CancelSend(val eventId: String, val force: Boolean) : RoomDetailAction()
+                  data class CancelSend(val event: TimelineEvent, val force: Boolean) : RoomDetailAction()

Contributor

NicolasBuquet Apr 9, 2024

Ajouter un Tchap commentaire

Contributor Author

yostyle Apr 10, 2024

je préfère ne pas en mettre. le lint oblige d'ajouter un saut de ligne au dessus du commentaire. ca rajoute de la complexité inutile en cas de conflit.

...r/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt

@@ @@ -71,7 +72,7 @@ sealed class EventSharedAction( @@
                   data class Redact(val eventId: String, val askForReason: Boolean, val dialogTitleRes: Int, val dialogDescriptionRes: Int) :
                           EventSharedAction(R.string.message_action_item_redact, R.drawable.ic_delete, true)
-                  data class Cancel(val eventId: String, val force: Boolean) :
+                  data class Cancel(val event: TimelineEvent, val force: Boolean) :

Contributor

NicolasBuquet Apr 9, 2024

Add Tchap commentaire

Contributor Author

yostyle Apr 10, 2024

je préfère ne pas en mettre. le lint oblige d'ajouter un saut de ligne au dessus du commentaire. ca rajoute de la complexité inutile en cas de conflit.

NicolasBuquet reviewed

View reviewed changes

Contributor

NicolasBuquet left a comment

Ajouter un changelog STP

tchap-danger-bot bot commented Apr 10, 2024

	Warnings
⚠️	Please add a changelog. See instructions here
⚠️	Please add a reviewer to your PR.

Generated by 🚫 dangerJS against d22e847


          Fix PR comments

efdec04

yostyle force-pushed the yostyle/fix_image_permission branch from d22e847 to efdec04 Compare

April 10, 2024 00:42

tchap-danger-bot bot commented Apr 10, 2024

	Warnings
⚠️	Please add a changelog. See instructions here
⚠️	Please add a reviewer to your PR.

Generated by 🚫 dangerJS against efdec04


          Fix package name

8af2f48

tchap-danger-bot bot commented Apr 10, 2024

	Warnings
⚠️	Please add a changelog. See instructions here
⚠️	Please add a reviewer to your PR.

Generated by 🚫 dangerJS against 8af2f48


          Add changelog

83f2aef

yostyle requested a review from NicolasBuquet

April 10, 2024 08:29

NicolasBuquet approved these changes

View reviewed changes

Contributor

NicolasBuquet left a comment

PR assez conséquente ! Bravo 👏

LGTM

yostyle merged commit 1714362 into develop

17 of 18 checks passed

yostyle deleted the yostyle/fix_image_permission branch

April 10, 2024 10:09

yostyle mentioned this pull request

Crash when sending a picture from the device's gallery #569

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet