sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fehler bei anzeigen von Ordnern mit umlauten behoben

Browse Source
This commit is contained in:
Joshua
2018-12-17 16:06:41 +01:00
parent 1e0b2a8952
commit c549bb39a4
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java
View File

@@ -1,6 +1,7 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import org.json.JSONArray; import org.json.JSONArray;
@@ -9,6 +10,9 @@ import org.json.JSONObject;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.services.KVV.types.Modules;
@@ -95,10 +99,18 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
} else { } else {
// in sub folder // in sub folder
for (Resource res2: resources) { for (Resource res2: resources) {
if (res2.getUrl().endsWith(res.getContainer()) && res2 instanceof Resource.Folder) { try {
String utf8Name;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
utf8Name = StandardCharsets.UTF_8.name();
else utf8Name = "UTF-8";
if (URLDecoder.decode(res2.getUrl(), utf8Name).endsWith(res.getContainer()) && res2 instanceof Resource.Folder) {
// Append File/Folder to list // Append File/Folder to list
((Resource.Folder) res2).add(res); ((Resource.Folder) res2).add(res);
} }
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
} }
} }