caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

SMS permission crashfix

Browse source
This commit is contained in:
AdrianLxM 2016-11-25 12:00:15 +01:00 committed by AdrianLxM
parent 33d783e9b0
commit ff29a795db
1 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/info/nightscout/androidaps/MainActivity.java
View file

@ -41,8 +41,10 @@ public class MainActivity extends AppCompatActivity {
private static KeepAliveReceiver keepAliveReceiver;
static final Integer CASE_STORAGE = 0x1;
static final Integer CASE_SMS = 0x2;
static final int CASE_STORAGE = 0x1;
static final int CASE_SMS = 0x2;
private boolean askForSMS = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -195,6 +197,29 @@ public class MainActivity extends AppCompatActivity {
//check for sms permission if enable in prefernces
@Subscribe
public void onStatusEvent(final EventPreferenceChange ev) {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
SharedPreferences smssettings = PreferenceManager.getDefaultSharedPreferences(this);
synchronized (this){
if (smssettings.getBoolean("smscommunicator_remotecommandsallowed", false)) {
setAskForSMS();
}
}
}
}
private synchronized void setAskForSMS() {
askForSMS = true;
}
@Override
protected void onResume(){
super.onResume();
askForSMSPermissions();
}
private synchronized void askForSMSPermissions(){
if (askForSMS) { //only when settings were changed an MainActivity resumes.
askForSMS = false;
SharedPreferences smssettings = PreferenceManager.getDefaultSharedPreferences(this);
if (smssettings.getBoolean("smscommunicator_remotecommandsallowed", false)) {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
@ -204,6 +229,7 @@ public class MainActivity extends AppCompatActivity {
}
}
}
}
private void askForPermission(String[] permission, Integer requestCode) {
boolean test = false;
@ -221,14 +247,14 @@ public class MainActivity extends AppCompatActivity {
if(ActivityCompat.checkSelfPermission(this, permissions[0]) == PackageManager.PERMISSION_GRANTED){
if(permissions.length != 0){
switch (requestCode) {
case 1:
case CASE_STORAGE:
//show dialog after permission is granted
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setMessage(R.string.alert_dialog_storage_permission_text);
alert.setPositiveButton(R.string.alert_dialog_positive_button,null);
alert.show();
break;
case 2:
case CASE_SMS:
break;
}
}