Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove use of ancient clipboard class

Browse source
This commit is contained in:
Eric House 2022-05-02 17:47:56 -07:00
parent 0a216e1082
commit 49076c54f8
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
View file

@ -1,6 +1,6 @@
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
/*
* Copyright 2009-2015 by Eric House (xwords@eehouse.org). All rights
* Copyright 2009 - 2022 by Eric House (xwords@eehouse.org). All rights
* reserved.
*
* This program is free software; you can redistribute it and/or
@ -21,6 +21,8 @@
package org.eehouse.android.xw4;
import android.app.Activity;
import android.content.ClipData;;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
@ -691,29 +693,12 @@ public class GameUtils {
return rowid;
}
// @SuppressLint({ "NewApi", "NewApi", "NewApi", "NewApi" })
// @SuppressWarnings("deprecation")
// @TargetApi(11)
public static void inviteURLToClip( Context context, NetLaunchInfo nli )
{
Uri gameUri = nli.makeLaunchUri( context );
String asStr = gameUri.toString();
int sdk = Build.VERSION.SDK_INT;
if ( sdk < Build.VERSION_CODES.HONEYCOMB ) {
android.text.ClipboardManager clipboard =
(android.text.ClipboardManager)
context.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setText( asStr );
} else {
android.content.ClipboardManager clipboard =
(android.content.ClipboardManager)
context.getSystemService(Context.CLIPBOARD_SERVICE);
String label = LocUtils.getString( context, R.string.clip_label );
android.content.ClipData clip = android.content.ClipData
.newPlainText( label, asStr );
clipboard.setPrimaryClip( clip );
}
Utils.stringToClip( context, asStr );
Utils.showToast( context, R.string.invite_copied );
}

7
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
View file

@ -26,6 +26,8 @@ import android.app.Dialog;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.ClipData;;
import android.content.ClipboardManager;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@ -43,7 +45,6 @@ import android.os.Looper;
import android.provider.ContactsContract.PhoneLookup;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
import android.text.ClipboardManager;
import android.util.Base64;
import android.view.Menu;
import android.view.MenuItem;
@ -266,7 +267,9 @@ public class Utils {
{
ClipboardManager clipboard = (ClipboardManager)
context.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setText( str );
String label = LocUtils.getString( context, R.string.clip_label );
ClipData clip = ClipData.newPlainText( label, str );
clipboard.setPrimaryClip( clip );
}
public static void postNotification( Context context, Intent intent,