Skip to content

Commit 7d9a2fa

Browse files
goginsgogins
committed
More consistent permissions and API levels for #29.
1 parent f7d6e19 commit 7d9a2fa

5 files changed

Lines changed: 24 additions & 11 deletions

File tree

‎CsoundForAndroid/CsoundForAndroid/CsoundAndroid/src/main/AndroidManifest.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
4-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
3+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
4+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
5+
<uses-permission android:name="android.permission.BODY_SENSORS"/>
6+
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
7+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
8+
<uses-permission android:name="android.permission.EXTERNAL_STORAGE"/>
9+
<uses-permission android:name="android.permission.INTERNET"/>
10+
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/> -->
11+
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
512
<!-- MODIFY_AUDIO_SETTINGS is needed to use audio effects such as environmental reverb -->
613
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
14+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
715
<uses-permission android:name="android.permission.RECORD_AUDIO" />
16+
<!-- To write all files until API level 29. We will use MediaStore from API level 30 -->
17+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
818
</manifest>

‎CsoundForAndroid/CsoundForAndroid/CsoundApplication/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ android {
3535
applicationId "com.csounds.Csound6"
3636
minSdkVersion 22
3737
targetSdkVersion 33
38-
versionCode 39
39-
versionName '6.18.1'
38+
versionCode 40
39+
versionName '6.19.0'
4040
multiDexEnabled true
4141
signingConfig signingConfigs.release
4242
}

‎CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:installLocation="auto">
5-
65
<!-- <uses-feature android:name="android.hardware.audio.output" android:required="true" /> -->
76
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
87
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -11,11 +10,14 @@
1110
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
1211
<uses-permission android:name="android.permission.EXTERNAL_STORAGE"/>
1312
<uses-permission android:name="android.permission.INTERNET"/>
14-
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
1513
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/> -->
1614
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
17-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
18-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
15+
<!-- MODIFY_AUDIO_SETTINGS is needed to use audio effects such as environmental reverb -->
16+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
17+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
18+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
19+
<!-- To write all files until API level 29. We will use MediaStore from API level 30 -->
20+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
1921
<application
2022
android:theme="@style/csoundTheme"
2123
android:icon="@drawable/cs"

‎CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/java/com/csounds/Csound6/CsoundAppActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,6 +1161,7 @@ public String loadTextFromUri(Uri uri) throws java.io.IOException {
11611161
@Override
11621162
protected void onActivityResult(int requestCode, int resultCode,
11631163
Intent intent) {
1164+
super.onActivityResult(requestCode, resultCode, intent);
11641165
try {
11651166
Log.d("Csound", "onActivityResult: " + requestCode + "," + resultCode + ", " + intent.toString() + "\n");
11661167
if (requestCode == NEW_FILE_REQUEST && intent != null) {
@@ -1200,13 +1201,13 @@ protected void onActivityResult(int requestCode, int resultCode,
12001201
String extension = "";
12011202
int i = pathname.lastIndexOf('.');
12021203
if (i >= 0) {
1203-
extension = pathname.substring(i+1);
1204+
extension = pathname.substring(i + 1);
12041205
}
12051206
setEditorText(text, extension);
12061207
loadWebView();
12071208
String title = uriToFilename(csound_uri);
12081209
setTitle(title);
1209-
}
1210+
}
12101211
} catch (Exception e) {
12111212
Log.e("Csound:", e.toString());
12121213
}

‎CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">Csound for Android 6.18.1</string>
3+
<string name="app_name">Csound for Android 6.19.0</string>
44
<string name="slider1">slider1</string>
55
<string name="slider2">slider2</string>
66
<string name="slider3">slider3</string>

0 commit comments

Comments
 (0)