From 5eb29a0c21a490dfcdcfb7cff4809dd9fce5ecb0 Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 7 Mar 2019 09:13:50 -0800 Subject: [PATCH] display the Banned alert from invite-choice dialog --- .../eehouse/android/xw4/InviteChoicesAlert.java | 15 ++++++++++++--- .../java/org/eehouse/android/xw4/XWActivity.java | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) 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 09489fd52..466882d73 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 @@ -32,13 +32,14 @@ import android.widget.Button; import java.util.ArrayList; import java.util.List; +import org.eehouse.android.xw4.DBUtils.SentInvitesInfo; import org.eehouse.android.xw4.DlgDelegate.Action; import org.eehouse.android.xw4.DlgDelegate.ActionPair; +import org.eehouse.android.xw4.DlgDelegate.ConfirmThenBuilder; import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify.InviteMeans; import org.eehouse.android.xw4.DlgDelegate.NotAgainBuilder; -import org.eehouse.android.xw4.DlgDelegate.ConfirmThenBuilder; +import org.eehouse.android.xw4.Perms23.Perm; import org.eehouse.android.xw4.loc.LocUtils; -import org.eehouse.android.xw4.DBUtils.SentInvitesInfo; public class InviteChoicesAlert extends DlgDelegateAlert { @@ -117,7 +118,14 @@ public class InviteChoicesAlert extends DlgDelegateAlert { .show(); break; case SMS_DATA: - if ( ! XWPrefs.getNBSEnabled( context ) ) { + if ( !Perms23.havePermissions( activity, Perm.SEND_SMS, Perm.RECEIVE_SMS ) + && Perm.SEND_SMS.isBanned() ) { + activity + .makeOkOnlyBuilder( R.string.sms_banned_ok_only ) + .setActionPair(new ActionPair( Action.PERMS_BANNED_INFO, + R.string.button_more_info ) ) + .show(); + } else if ( ! XWPrefs.getNBSEnabled( context ) ) { activity .makeConfirmThenBuilder( R.string.warn_sms_disabled, Action.ENABLE_NBS_ASK ) @@ -127,6 +135,7 @@ public class InviteChoicesAlert extends DlgDelegateAlert { } break; } + Button button = ((AlertDialog)dlg) .getButton( AlertDialog.BUTTON_POSITIVE ); button.setEnabled( true ); 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 a0afec98f..0d179cac3 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 @@ -221,6 +221,11 @@ public class XWActivity extends FragmentActivity return m_dlgt.makeConfirmThenBuilder( msgID, action ); } + public DlgDelegate.OkOnlyBuilder makeOkOnlyBuilder( int msgID ) + { + return m_dlgt.makeOkOnlyBuilder( msgID ); + } + ////////////////////////////////////////////////////////////////////// // Delegator interface //////////////////////////////////////////////////////////////////////