lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable NO_SCOPED_STORAGE on Android 11+ 

This enables system file picker.
Side effects are not tested.
This commit is contained in:
arm64v8a 2021-11-09 23:47:17 +08:00
parent dea17045af
commit a08f0973a4
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View File

@ -12,6 +12,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Build;
@SuppressWarnings("ConstantConditions")
public class BuildVars {
@ -20,7 +21,7 @@ public class BuildVars {
public static boolean DEBUG_PRIVATE_VERSION = DEBUG_VERSION;
public static boolean LOGS_ENABLED = DEBUG_PRIVATE_VERSION;
public static boolean USE_CLOUD_STRINGS = true;
public static boolean NO_SCOPED_STORAGE = true;
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
public static int BUILD_VERSION; // generated
public static String BUILD_VERSION_STRING;

14
TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/EnvUtil.kt
View File

@ -50,15 +50,9 @@ object EnvUtil {
@JvmStatic
fun getTelegramPath(): File {
if (NekomuraConfig.cachePath.String() == null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
// https://github.com/NekoX-Dev/NekoX/issues/284
NekomuraConfig.cachePath.setConfigString(File(ApplicationLoader.getDataDirFixed(), "cache/media").path)
} else {
NekomuraConfig.cachePath.setConfigString(ApplicationLoader.applicationContext.getExternalFilesDir("files")?.parent ?: File(ApplicationLoader.getDataDirFixed(), "cache/media").path)
}
if (NekomuraConfig.cachePath.String() == "") {
// https://github.com/NekoX-Dev/NekoX/issues/284
NekomuraConfig.cachePath.setConfigString(availableDirectories[2]);
}
var telegramPath = File(NekomuraConfig.cachePath.String())
@ -69,6 +63,8 @@ object EnvUtil {
}
// fallback
telegramPath = ApplicationLoader.applicationContext.getExternalFilesDir(null) ?: File(ApplicationLoader.getDataDirFixed(), "cache/files")
if (telegramPath.isDirectory || telegramPath.mkdirs()) {