tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash on systems below Marshmallow

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-19 00:22:05 +02:00
commit 3f83128161
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -50,8 +50,8 @@ android {
applicationId "com.kabouzeid.gramophone" applicationId "com.kabouzeid.gramophone"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 65 versionCode 66
versionName "0.9.43 beta6" versionName "0.9.43 beta7"
} }
buildTypes { buildTypes {
release { release {

7
app/src/main/assets/changelog.html
View file

@ -25,6 +25,13 @@
<p>You can view the changelog dialog again at any time from the <i>about</i> section.</p> <p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>
<h3>Version 0.9.43 beta6</h3>
<ol>
<li><b>FIX:</b> Typo caused 0.9.43 beta5 to crash on systems below Marshmallow.</a>.
</li>
</ol>
<h3>Version 0.9.43 beta5</h3> <h3>Version 0.9.43 beta5</h3>
<ol> <ol>

11
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsMusicServiceActivity.java
View file

@ -15,6 +15,7 @@ import android.os.IBinder;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.widget.Toast; import android.widget.Toast;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener; import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
import com.kabouzeid.gramophone.service.MusicService; import com.kabouzeid.gramophone.service.MusicService;
@ -196,13 +197,15 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
private void checkExternalStoragePermissions() { private void checkExternalStoragePermissions() {
hasExternalStoragePermission = hasExternalStoragePermission(); hasExternalStoragePermission = hasExternalStoragePermission();
if (hasExternalStoragePermission) { if (!hasExternalStoragePermission) {
requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_EXTERNAL_STORAGE_PERMISSION); 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() { 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 @Override
@ -215,7 +218,7 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
return; 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();
} }
} }
} }

1
app/src/main/res/values/strings.xml
View file

@ -182,4 +182,5 @@
<string name="colored_footers">Colored footers</string> <string name="colored_footers">Colored footers</string>
<string name="special_thanks_to">Special thanks to</string> <string name="special_thanks_to">Special thanks to</string>
<string name="changelog">Changelog</string> <string name="changelog">Changelog</string>
<string name="permission_to_access_external_storage_denied">Permission to access external storage denied.</string>
</resources> </resources>