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

[android] Fix copied to clipboard not showing when on lock screen (#7246)

Browse source 
* [android] Fix copied to clipbaord not showing when on lock screen

The issue stated that the app does not show any visual feedback when copied place name, description or wikipedia from lock screen.

Made code changes at three places which will fix the issue.

Fixes:#6938

Signed-off-by: arjundevasi <Ardevasi97@gmail.com>

* fixed copied to clipboard not showing when on lock screen and merged if condition
Signed-off-by: arjundevasi <Ardevasi97@gmail.com>

* fixed copied to clipboard not showing when on lock screen and made changes as requested by admins.
Signed-off-by: arjundevasi <Ardevasi97@gmail.com>

* Update android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java

Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Signed-off-by: Arjun Devasi <ardevasi97@gmail.com>

* made changes as requested

Signed-off-by: arjundevasi <Ardevasi97@gmail.com>

---------

Signed-off-by: arjundevasi <Ardevasi97@gmail.com>
Signed-off-by: Arjun Devasi <ardevasi97@gmail.com>
Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
This commit is contained in:
Arjun Devasi 2024-02-05 03:05:05 +05:30 • committed by GitHub
parent 86f2a14efa
commit 840e9dd7df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java
View file

@ -1,5 +1,6 @@
package app.organicmaps.widget.placepage;
import android.app.KeyguardManager;
import android.content.Context;
import android.os.Build;
import android.view.Menu;
@ -72,7 +73,10 @@ public class PlacePageUtils
public static void copyToClipboard(Context context, View frame, String text)
{
Utils.copyTextToClipboard(context, text);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
// Starting from API 33, the automatic system control that shows copied text is displayed.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || keyguardManager.isDeviceLocked())
{
Utils.showSnackbarAbove(frame.getRootView().findViewById(R.id.pp_buttons_layout), frame,
context.getString(R.string.copied_to_clipboard, text));

5
android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
View file

@ -1,5 +1,6 @@
package app.organicmaps.widget.placepage.sections;
import android.app.KeyguardManager;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
@ -137,7 +138,9 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
final Context ctx = requireContext();
Utils.copyTextToClipboard(ctx, notes);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
KeyguardManager keyguardManager = (KeyguardManager) ctx.getSystemService(Context.KEYGUARD_SERVICE);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || keyguardManager.isDeviceLocked())
{
Utils.showSnackbarAbove(mFrame.getRootView().findViewById(R.id.pp_buttons_layout), mFrame,
ctx.getString(R.string.copied_to_clipboard, notes));

5
android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
View file

@ -1,5 +1,6 @@
package app.organicmaps.widget.placepage.sections;
import android.app.KeyguardManager;
import android.content.Context;
import android.os.Build;
import android.text.TextUtils;
@ -88,7 +89,9 @@ public class PlacePhoneAdapter extends RecyclerView.Adapter<PlacePhoneAdapter.Vi
final String phoneNumber = mPhone.getText().toString();
final Context ctx = view.getContext();
Utils.copyTextToClipboard(ctx, phoneNumber);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
KeyguardManager keyguardManager = (KeyguardManager) ctx.getSystemService(Context.KEYGUARD_SERVICE);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || keyguardManager.isDeviceLocked())
{
Utils.showSnackbarAbove(view.getRootView().findViewById(R.id.pp_buttons_layout), view,
ctx.getString(R.string.copied_to_clipboard, phoneNumber));