diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 361650439..9a0abbf7b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -25,13 +25,13 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.Html;
import android.text.TextUtils;
import android.view.Display;
-
import org.eehouse.android.xw4.jni.CommonPrefs;
import org.eehouse.android.xw4.jni.CommsAddrRec;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
@@ -674,8 +674,8 @@ public class GameUtils {
Uri gameUri = nli.makeLaunchUri( context );
String asStr = gameUri.toString();
- int sdk = android.os.Build.VERSION.SDK_INT;
- if ( sdk < android.os.Build.VERSION_CODES.HONEYCOMB ) {
+ int sdk = Build.VERSION.SDK_INT;
+ if ( sdk < Build.VERSION_CODES.HONEYCOMB ) {
android.text.ClipboardManager clipboard =
(android.text.ClipboardManager)
context.getSystemService(Context.CLIPBOARD_SERVICE);
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
index 1b5aab199..09489fd52 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
@@ -67,8 +67,8 @@ public class InviteChoicesAlert extends DlgDelegateAlert {
lastMeans = ((SentInvitesInfo)state.m_params[0]).getLastMeans();
}
- add( items, means, R.string.invite_choice_user_sms, InviteMeans.SMS_USER );
add( items, means, R.string.invite_choice_email, InviteMeans.EMAIL );
+ add( items, means, R.string.invite_choice_user_sms, InviteMeans.SMS_USER );
if ( BTService.BTAvailable() ) {
add( items, means, R.string.invite_choice_bt, InviteMeans.BLUETOOTH );
@@ -102,6 +102,12 @@ public class InviteChoicesAlert extends DlgDelegateAlert {
XWActivity activity = (XWActivity)getActivity();
sel[0] = pos;
switch ( means.get(pos) ) {
+ case SMS_USER:
+ activity
+ .makeNotAgainBuilder( R.string.sms_invite_flakey,
+ R.string.key_na_sms_invite_flakey )
+ .show();
+ break;
case CLIPBOARD:
String msg =
getString( R.string.not_again_clip_expl_fmt,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
index df83b45fb..a0afec98f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
@@ -210,6 +210,11 @@ public class XWActivity extends FragmentActivity
return m_dlgt.makeNotAgainBuilder( msg, keyId );
}
+ public DlgDelegate.NotAgainBuilder makeNotAgainBuilder( int msgID, int keyId )
+ {
+ return m_dlgt.makeNotAgainBuilder( msgID, keyId );
+ }
+
public DlgDelegate.ConfirmThenBuilder makeConfirmThenBuilder( int msgID,
Action action )
{
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index 65e624f9e..fde42fefd 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -120,6 +120,7 @@
key_na_studycopy
key_na_fmt_expl
key_na_clip_expl
+ key_na_sms_invite_flakey
key_na_dicts
key_enable_debug
key_enable_dup_invite
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 3d2f44f84..b45caa79e 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -579,6 +579,16 @@
number %1$s on %2$s
Invite sent via SMS messaging
to phone number %1$s on %2$s
+
+
+ This new option launches your
+ default SMS app with an invitation ready to send -- when it
+ works. Each SMS app is different, and some won\'t
+ cooperate.
+
+
+ Unable to launch SMS app
+
Invite sent via Bluetooth to
paired device \"%1$s\" on %2$s
Invite forwarded by the relay