[android] Fix saving to Google Drive #8817

2024-08-01T14:00:50Z

krozhdestvenski commented

2024-08-01 14:00:50 +00:00

(Migrated from github.com)

Fix issue organicmaps/organicmaps#8806

Fix issue https://git.omaps.dev/organicmaps/organicmaps/issues/8806

biodranik (Migrated from github.com) reviewed 2024-08-01 14:22:29 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

biodranik (Migrated from github.com) commented

2024-08-01 14:22:29 +00:00

Should it be inside if (context instanceof Application), as it is done in other apps?

Should it be inside `if (context instanceof Application)`, as it is done in other apps?

krozhdestvenski (Migrated from github.com) reviewed 2024-08-01 14:44:55 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

krozhdestvenski (Migrated from github.com) commented

2024-08-01 14:44:55 +00:00

In this case context is Activity.

biodranik (Migrated from github.com) reviewed 2024-08-01 14:46:54 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

biodranik (Migrated from github.com) commented

2024-08-01 14:46:54 +00:00

Does it allow to come back into Organic Maps after the file is exported?

krozhdestvenski (Migrated from github.com) reviewed 2024-08-01 15:13:51 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

krozhdestvenski (Migrated from github.com) commented

2024-08-01 15:13:51 +00:00

Yes. After exporting we return to Organic Maps (checked it for exporting to Google Drive and local deevice)

biodranik (Migrated from github.com) reviewed 2024-08-01 16:59:56 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

biodranik (Migrated from github.com) commented

2024-08-01 16:59:56 +00:00

There are several more places in the code where this function is called. Did you test it on different Android versions too? Does it work on Android 5?

krozhdestvenski (Migrated from github.com) reviewed 2024-08-01 21:05:52 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

krozhdestvenski (Migrated from github.com) commented

2024-08-01 21:05:52 +00:00

i tested it in send bug report functionality.
It works correcctly on Android 10
On Android 5 send e-mail and savind to documents work too. Saving to Google Drive i can't check

i tested it in send bug report functionality. It works correcctly on Android 10 On Android 5 send e-mail and savind to documents work too. Saving to Google Drive i can't check

biodranik (Migrated from github.com) reviewed 2024-08-03 10:48:49 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

biodranik (Migrated from github.com) commented

2024-08-03 10:48:49 +00:00

Should FLAG_ACTIVITY_NEW_TASK be used when a single bookmark or POI is shared from the Place Page?

biodranik (Migrated from github.com) reviewed 2024-08-06 07:10:34 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));

biodranik (Migrated from github.com) commented

2024-08-06 07:10:34 +00:00

      intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK);

```suggestion intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK); ```

krozhdestvenski (Migrated from github.com) reviewed 2024-08-06 08:01:36 +00:00

android/app/src/main/java/app/organicmaps/util/SharingUtils.java

					
				@ -229,3 +231,3 @@

				      final Uri fileUri = StorageUtils.getUriForFilePath(context, info.mFileName);

				      Logger.i(TAG, "Sharing file " + info.mMimeType + " " + info.mFileName + " with URI " + fileUri);

				      intent.putExtra(Intent.EXTRA_STREAM, fileUri);

				      intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, new ArrayList<>(List.of(fileUri)));