atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

AssetManager: fix resource loading if APK path contains spaces

Browse Source 
Spaces will get encoded to %20 by the ClassLoader. We need to decode
them again to get the original path.
This commit is contained in:
Julian Winkler
2024-11-01 17:49:20 +01:00
parent 8734a7ef2b
commit acdd3c88cc
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api-impl/android/content/res/AssetManager.java
View File

@@ -28,6 +28,7 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.net.URLDecoder;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@@ -114,6 +115,7 @@ public final class AssetManager {
paths.add(null); // reserve first slot for framework-res.apk paths.add(null); // reserve first slot for framework-res.apk
while (resources.hasMoreElements()) { while (resources.hasMoreElements()) {
String path = resources.nextElement().getPath(); String path = resources.nextElement().getPath();
path = URLDecoder.decode(path, "UTF-8");
if (path.contains("framework-res.apk")) // needs to be first, so it can be overridden if (path.contains("framework-res.apk")) // needs to be first, so it can be overridden
paths.set(0, path); paths.set(0, path);
else if (!path.contains("com.google.android.gms")) // microg resources can not be merged else if (!path.contains("com.google.android.gms")) // microg resources can not be merged