RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Save bookmarks to local device

Browse source 
Signed-off-by: Kiryl Razhdzestvenski <kirill.rozh@gmail.com>
This commit is contained in:
krozhdestvenski 2024-05-30 09:14:31 +02:00 • committed by GitHub
parent 9af27a3ed4
commit b876c5d927
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 84 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java
View file

@ -12,6 +12,7 @@ import android.provider.DocumentsContract;
import android.view.View;
import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.CallSuper;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
@ -26,6 +27,7 @@ import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.bookmarks.data.KmlFileType;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.PlaceholderView;
import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
@ -60,6 +62,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
public static final String BOOKMARKS_CATEGORIES_MENU_ID = "BOOKMARKS_CATEGORIES_BOTTOM_SHEET";
private ActivityResultLauncher<Intent> shareLauncher;
@Nullable
private BookmarkCategory mSelectedCategory;
@Nullable
@ -104,6 +108,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
rw.addItemDecoration(decor);
mCategoriesAdapterObserver = this::onCategoriesChanged;
BookmarkManager.INSTANCE.addCategoriesUpdatesListener(mCategoriesAdapterObserver);
shareLauncher = SharingUtils.RegisterLauncher(this);
}
protected void onPrepareControllers(@NonNull View view)
@ -114,7 +120,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
@Override
public void onPreparedFileForSharing(@NonNull BookmarkSharingResult result)
{
BookmarksSharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), result);
BookmarksSharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), shareLauncher, result);
}
@Override

7
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
View file

@ -11,6 +11,7 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -64,6 +65,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private static final String TRACK_MENU_ID = "TRACK_MENU_BOTTOM_SHEET";
private static final String OPTIONS_MENU_ID = "OPTIONS_MENU_BOTTOM_SHEET";
private ActivityResultLauncher<Intent> shareLauncher;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private SearchToolbarController mToolbarController;
@ -102,6 +105,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
super.onCreate(savedInstanceState);
BookmarkCategory category = getCategoryOrThrow();
mCategoryDataSource = new CategoryDataSource(category);
shareLauncher = SharingUtils.RegisterLauncher(this);
}
@NonNull
@ -737,7 +742,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
@Override
public void onPreparedFileForSharing(@NonNull BookmarkSharingResult result)
{
BookmarksSharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), result);
BookmarksSharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), shareLauncher, result);
}
@Override

4
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
View file

@ -3,6 +3,7 @@ package app.organicmaps.bookmarks;
import android.app.Activity;
import android.app.ProgressDialog;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
@ -46,6 +47,7 @@ public enum BookmarksSharingHelper
}
public void onPreparedFileForSharing(@NonNull FragmentActivity context,
@NonNull ActivityResultLauncher launcher,
@NonNull BookmarkSharingResult result)
{
if (mProgressDialog != null && mProgressDialog.isShowing())
@ -54,7 +56,7 @@ public enum BookmarksSharingHelper
switch (result.getCode())
{
case BookmarkSharingResult.SUCCESS ->
SharingUtils.shareBookmarkFile(context, result.getSharingPath());
SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath());
case BookmarkSharingResult.EMPTY_CATEGORY ->
new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.bookmarks_error_title_share_empty)

48
android/app/src/main/java/app/organicmaps/util/SharingUtils.java
View file

@ -1,5 +1,8 @@
package app.organicmaps.util;
import static androidx.activity.result.ActivityResultCallerKt.registerForActivityResult;
import android.app.Activity;
import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
@ -8,7 +11,13 @@ import android.location.Location;
import android.net.Uri;
import android.text.TextUtils;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.documentfile.provider.DocumentFile;
import androidx.fragment.app.Fragment;
import java.io.IOException;
import app.organicmaps.Framework;
import app.organicmaps.R;
@ -20,6 +29,8 @@ public class SharingUtils
private static final String KMZ_MIME_TYPE = "application/vnd.google-earth.kmz";
private static final String TEXT_MIME_TYPE = "text/plain";
private static Uri sourceFileUri;
// This utility class has only static methods
private SharingUtils()
{
@ -92,7 +103,29 @@ public class SharingUtils
context.startActivity(Intent.createChooser(intent, context.getString(R.string.share)));
}
public static void shareBookmarkFile(Context context, String fileName)
public static ActivityResultLauncher<Intent> RegisterLauncher(@NonNull Fragment fragment)
{
return fragment.registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(), result ->
{
if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null)
{
Uri destinationUri = result.getData().getData();
Uri sourceUri = sourceFileUri;
sourceFileUri = null;
try
{
if (sourceUri != null && destinationUri != null)
StorageUtils.copyFile(fragment.requireContext().getContentResolver(), sourceUri, destinationUri);
}
catch (IOException e)
{
throw new RuntimeException(e);
}
}
});
}
public static void shareBookmarkFile(Context context, ActivityResultLauncher<Intent> launcher, String fileName)
{
Intent intent = new Intent(Intent.ACTION_SEND);
@ -113,6 +146,15 @@ public class SharingUtils
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
}
Intent saveIntent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
saveIntent.setType(KMZ_MIME_TYPE);
DocumentFile documentFile = DocumentFile.fromSingleUri(context, fileUri);
if (documentFile != null)
saveIntent.putExtra(Intent.EXTRA_TITLE, documentFile.getName());
sourceFileUri = fileUri;
Intent[] extraIntents = {saveIntent};
Intent chooser = Intent.createChooser(intent, context.getString(R.string.share));
// Prevent sharing to ourselves (supported from API Level 24).
@ -122,6 +164,8 @@ public class SharingUtils
chooser.putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, excludeSelf);
}
context.startActivity(chooser);
chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS, extraIntents);
launcher.launch(chooser);
}
}

31
android/app/src/main/java/app/organicmaps/util/StorageUtils.java
View file

@ -163,25 +163,38 @@ public class StorageUtils
* @return true on success and false if the provider recently crashed.
* @throws IOException - if I/O error occurs.
*/
static private boolean copyFile(InputStream from, OutputStream to) throws IOException
{
if (from == null || to == null)
return false;
byte[] buf = new byte[4 * 1024];
int len;
while ((len = from.read(buf)) > 0)
to.write(buf, 0, len);
return true;
}
public static boolean copyFile(@NonNull ContentResolver resolver, @NonNull Uri from, @NonNull File to) throws IOException
{
try (InputStream in = resolver.openInputStream(from))
{
if (in == null)
return false;
try (OutputStream out = new FileOutputStream(to))
{
byte[] buf = new byte[4 * 1024];
int len;
while ((len = in.read(buf)) > 0)
out.write(buf, 0, len);
return true;
return copyFile(in, out);
}
}
}
public static boolean copyFile(@NonNull ContentResolver resolver,@NonNull Uri from,@NonNull Uri to) throws IOException {
try (InputStream in = resolver.openInputStream(from))
{
try (OutputStream out = resolver.openOutputStream(to))
{
return copyFile(in, out);
}
}
}
/**
* Recursively lists all movable files in the directory.
*/