tslocum/meditationassistant
tslocum
/
meditationassistant
1
2
Fork 0
Code Issues 27 Pull Requests Releases Activity

Do not request permission again when denied 

Fixes #40
This commit is contained in:
Trevor Slocum 2019-09-19 23:28:12 -07:00
parent 19a74d8218
commit 06c315638b
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MainActivity.java
View File

@ -405,9 +405,7 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
startActivity(new Intent(
Intent.ACTION_VIEW,
Uri.parse(MeditationAssistant.URL_MEDINET + "/translate")).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
break;
case DialogInterface.BUTTON_NEGATIVE:
break;
}
@ -1629,9 +1627,7 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
getMeditationAssistant().rateApp();
break;
case DialogInterface.BUTTON_NEGATIVE:
break;
}
@ -2149,7 +2145,6 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
case DialogInterface.BUTTON_POSITIVE:
getMeditationAssistant().getMediNET().signOut();
break;
case DialogInterface.BUTTON_NEGATIVE:
break;
}

2
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
View File

@ -1822,7 +1822,7 @@ public class MeditationAssistant extends Application {
if (getMediNET().activity != null) {
AlertDialog staleDataDialog = new AlertDialog.Builder(
getMediNET().activity)
.setPositiveButton(R.string.wordimport,
.setPositiveButton(R.string.download,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog,

22
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
View File

@ -307,10 +307,10 @@ public class SettingsActivity extends PreferenceActivity {
switch (requestCode) {
case PERMISSION_REQUEST_SOUND_READ_EXTERNAL_STORAGE: {
if ((grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) || !ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.READ_EXTERNAL_STORAGE)) {
&& grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
getMeditationAssistant().showFilePickerDialog(SettingsActivity.this, selectingPrefsound, FilePickerActivity.MODE_FILE);
} else {
} else if (ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.READ_EXTERNAL_STORAGE)) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setIcon(
getResources()
@ -338,17 +338,17 @@ public class SettingsActivity extends PreferenceActivity {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
getMeditationAssistant().showFilePickerDialog(SettingsActivity.this, selectingPrefsound, FilePickerActivity.MODE_FILE);
}
}).show();
break;
}
}
case PERMISSION_REQUEST_IMPORT_READ_EXTERNAL_STORAGE: {
if ((grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) || !ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.READ_EXTERNAL_STORAGE)) {
&& grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
getMeditationAssistant().showImportSessionsDialog(SettingsActivity.this);
} else {
} else if (ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.READ_EXTERNAL_STORAGE)) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setIcon(
getResources()
@ -380,14 +380,15 @@ public class SettingsActivity extends PreferenceActivity {
public void onClick(DialogInterface dialogInterface, int i) {
}
}).show();
break;
}
}
case PERMISSION_REQUEST_EXPORT_WRITE_EXTERNAL_STORAGE: {
if ((grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) || !ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.READ_EXTERNAL_STORAGE)) {
&& grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
getMeditationAssistant().showFilePickerDialog(SettingsActivity.this, FILEPICKER_EXPORT_SESSIONS, FilePickerActivity.MODE_NEW_FILE);
} else {
} else if (ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setIcon(
getResources()
@ -419,6 +420,7 @@ public class SettingsActivity extends PreferenceActivity {
public void onClick(DialogInterface dialogInterface, int i) {
}
}).show();
break;
}
}
}

1
MeditationAssistant/src/main/res/values/strings.xml
View File

@ -236,6 +236,7 @@
<string name="discard">Discard</string>
<string name="save">Save</string>
<string name="post">Post</string>
<string name="download">Download</string>
<string name="downloadSessionsHint">Click "Download sessions" in settings to retrieve missing sessions.</string>
<string name="downloadsessionstitle">Download sessions?</string>
<string name="downloadsessionsmessage">Previous sessions will be downloaded.\n\nThis dialog will not appear again.\nYou