diff --git a/app/build.gradle b/app/build.gradle
index 06aad851..4b84eaec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,8 +50,8 @@ android {
applicationId "com.kabouzeid.gramophone"
minSdkVersion 16
targetSdkVersion 23
- versionCode 65
- versionName "0.9.43 beta6"
+ versionCode 66
+ versionName "0.9.43 beta7"
}
buildTypes {
release {
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 5a8a31ea..91ae5f0a 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -25,6 +25,13 @@
You can view the changelog dialog again at any time from the about section.
+Version 0.9.43 beta6
+
+
+ - FIX: Typo caused 0.9.43 beta5 to crash on systems below Marshmallow..
+
+
+
Version 0.9.43 beta5
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsMusicServiceActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsMusicServiceActivity.java
index 83dc1acb..fd7a04ba 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsMusicServiceActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsMusicServiceActivity.java
@@ -15,6 +15,7 @@ import android.os.IBinder;
import android.support.annotation.NonNull;
import android.widget.Toast;
+import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
import com.kabouzeid.gramophone.service.MusicService;
@@ -196,13 +197,15 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
private void checkExternalStoragePermissions() {
hasExternalStoragePermission = hasExternalStoragePermission();
- if (hasExternalStoragePermission) {
- requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_EXTERNAL_STORAGE_PERMISSION);
+ if (!hasExternalStoragePermission) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_EXTERNAL_STORAGE_PERMISSION);
+ }
}
}
private boolean hasExternalStoragePermission() {
- return Build.VERSION.SDK_INT < Build.VERSION_CODES.M || checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED;
+ return Build.VERSION.SDK_INT < Build.VERSION_CODES.M || checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
}
@Override
@@ -215,7 +218,7 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
return;
}
}
- Toast.makeText(AbsMusicServiceActivity.this, "You must grant permission to external storage in order to explore your music", Toast.LENGTH_SHORT).show();
+ Toast.makeText(AbsMusicServiceActivity.this, getResources().getString(R.string.permission_to_access_external_storage_denied), Toast.LENGTH_SHORT).show();
}
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ac48d64..054347a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,4 +182,5 @@
Colored footers
Special thanks to
Changelog
+ Permission to access external storage denied.