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

warn when 'sms data' selected in build where it's banned

Browse source
This commit is contained in:
Eric House 2019-03-06 22:38:53 -08:00
parent c97905e11e
commit 3326fc90f2
1 changed files with 19 additions and 4 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/ConnViaViewLayout.java
View file

@ -31,6 +31,8 @@ import android.widget.LinearLayout;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.eehouse.android.xw4.DlgDelegate.Action;
import org.eehouse.android.xw4.DlgDelegate.ActionPair;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType; import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet; import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
import org.eehouse.android.xw4.loc.LocUtils; import org.eehouse.android.xw4.loc.LocUtils;
@ -146,8 +148,15 @@ public class ConnViaViewLayout extends LinearLayout {
keyID = R.string.key_na_comms_relay; keyID = R.string.key_na_comms_relay;
break; break;
case COMMS_CONN_SMS: case COMMS_CONN_SMS:
msgID = R.string.not_again_comms_sms; if ( Perms23.havePermissions( getContext(),
keyID = R.string.key_na_comms_sms; Perms23.Perm.SEND_SMS,
Perms23.Perm.RECEIVE_SMS )
|| !Perms23.Perm.SEND_SMS.isBanned() ) {
msgID = R.string.not_again_comms_sms;
keyID = R.string.key_na_comms_sms;
} else {
msgID = R.string.sms_banned_ok_only;
}
break; break;
case COMMS_CONN_BT: case COMMS_CONN_BT:
msgID = R.string.not_again_comms_bt; msgID = R.string.not_again_comms_bt;
@ -161,8 +170,14 @@ public class ConnViaViewLayout extends LinearLayout {
Assert.fail(); Assert.fail();
break; break;
} }
m_dlgDlgt.makeNotAgainBuilder( msgID, keyID )
.show(); DlgDelegate.DlgDelegateBuilder builder = 0 != keyID
? m_dlgDlgt.makeNotAgainBuilder( msgID, keyID )
: m_dlgDlgt.makeOkOnlyBuilder( msgID )
.setActionPair( new ActionPair( Action.PERMS_BANNED_INFO,
R.string.button_more_info ) )
;
builder.show();
} }
} }
} }