Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-1039--category-images' into 'master'

Browse Source 
Fix missing category images.

Closes #1039

See merge request !526
This commit is contained in:
Hans-Christoph Steiner 2017-05-31 07:49:27 +00:00
commit dfadffd65b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -35,6 +35,7 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.StrictMode; import android.os.StrictMode;
import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
@ -279,13 +280,23 @@ public class FDroidApp extends Application {
Utils.getImageCacheDir(this), Utils.getImageCacheDir(this),
null, null,
new FileNameGenerator() { new FileNameGenerator() {
@NonNull
@Override @Override
public String generate(String imageUri) { public String generate(String imageUri) {
if (TextUtils.isEmpty(imageUri)) { if (TextUtils.isEmpty(imageUri)) {
return "null"; return "null";
} else {
return SanitizedFile.sanitizeFileName(Uri.parse(imageUri).getPath().replaceAll("/", "-"));
} }
String fileNameToSanitize;
Uri uri = Uri.parse(imageUri);
if (TextUtils.isEmpty(uri.getPath())) {
// e.g. files with a URL like "drawable://213083835209" used by the category backgrounds.
fileNameToSanitize = imageUri.replaceAll("[:/]", "");
} else {
fileNameToSanitize = uri.getPath().replace("/", "-");
}
return SanitizedFile.sanitizeFileName(fileNameToSanitize);
} }
}, },
// 30 days in secs: 30*24*60*60 = 2592000 // 30 days in secs: 30*24*60*60 = 2592000