mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Android: Fixed File::getSpecialLocation (userDocumentsDirectory) to return correct directory on newer Android versions

Browse source
This commit is contained in:
hogliux 2017-08-29 09:33:39 +01:00
parent 450de0d3a6
commit d5249492ae
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_core/native/java/JuceAppActivity.java
View file

@ -1226,7 +1226,14 @@ public class JuceAppActivity extends Activity
return Environment.getExternalStoragePublicDirectory (type).getAbsolutePath();
}
public static final String getDocumentsFolder() { return Environment.getDataDirectory().getAbsolutePath(); }
public static final String getDocumentsFolder()
{
if (getAndroidSDKVersion() >= android.os.Build.VERSION_CODES.KITKAT)
return getFileLocation (Environment.DIRECTORY_DOCUMENTS);
return Environment.getDataDirectory().getAbsolutePath();
}
public static final String getPicturesFolder() { return getFileLocation (Environment.DIRECTORY_PICTURES); }
public static final String getMusicFolder() { return getFileLocation (Environment.DIRECTORY_MUSIC); }
public static final String getMoviesFolder() { return getFileLocation (Environment.DIRECTORY_MOVIES); }
@ -1321,7 +1328,7 @@ public class JuceAppActivity extends Activity
return null;
}
public final int getAndroidSDKVersion()
public static final int getAndroidSDKVersion()
{
return android.os.Build.VERSION.SDK_INT;
}

2
modules/juce_core/native/juce_android_JNIHelpers.h
View file

@ -305,7 +305,7 @@ extern AndroidSystem android;
METHOD (getScreenSaver, "getScreenSaver", "()Z") \
METHOD (getAndroidMidiDeviceManager, "getAndroidMidiDeviceManager", "()L" JUCE_ANDROID_ACTIVITY_CLASSPATH "$MidiDeviceManager;") \
METHOD (getAndroidBluetoothManager, "getAndroidBluetoothManager", "()L" JUCE_ANDROID_ACTIVITY_CLASSPATH "$BluetoothManager;") \
METHOD (getAndroidSDKVersion, "getAndroidSDKVersion", "()I") \
STATICMETHOD (getAndroidSDKVersion, "getAndroidSDKVersion", "()I") \
METHOD (audioManagerGetProperty, "audioManagerGetProperty", "(Ljava/lang/String;)Ljava/lang/String;") \
METHOD (hasSystemFeature, "hasSystemFeature", "(Ljava/lang/String;)Z" ) \
METHOD (requestRuntimePermission, "requestRuntimePermission", "(IJ)V" ) \