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

Merge branch 'fix-1006' into 'master'

Browse Source 
prevent crash if installing app without icon

Closes #1006

See merge request !509
This commit is contained in:
Peter Serwylo 2017-05-09 06:01:40 +00:00
commit ca4e1c24a3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,11 @@ public class FDroidApp extends Application {
new FileNameGenerator() { new FileNameGenerator() {
@Override @Override
public String generate(String imageUri) { public String generate(String imageUri) {
return imageUri.substring(imageUri.lastIndexOf('/') + 1); if (TextUtils.isEmpty(imageUri)) {
return "null";
} else {
return imageUri.substring(imageUri.lastIndexOf('/') + 1);
}
} }
}, },
// 30 days in secs: 30*24*60*60 = 2592000 // 30 days in secs: 30*24*60*60 = 2592000

5
app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
View File

@ -18,6 +18,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.view.View; import android.view.View;
@ -494,7 +495,9 @@ class NotificationHelper {
private Bitmap getLargeIconForEntry(AppUpdateStatusManager.AppUpdateStatus entry) { private Bitmap getLargeIconForEntry(AppUpdateStatusManager.AppUpdateStatus entry) {
final Point largeIconSize = getLargeIconSize(); final Point largeIconSize = getLargeIconSize();
Bitmap iconLarge = null; Bitmap iconLarge = null;
if (entry.status == AppUpdateStatusManager.Status.Downloading || entry.status == AppUpdateStatusManager.Status.Installing) { if (TextUtils.isEmpty(entry.app.iconUrl)) {
return null;
} else if (entry.status == AppUpdateStatusManager.Status.Downloading || entry.status == AppUpdateStatusManager.Status.Installing) {
Bitmap bitmap = Bitmap.createBitmap(largeIconSize.x, largeIconSize.y, Bitmap.Config.ARGB_8888); Bitmap bitmap = Bitmap.createBitmap(largeIconSize.x, largeIconSize.y, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
Drawable downloadIcon = ContextCompat.getDrawable(context, R.drawable.ic_notification_download); Drawable downloadIcon = ContextCompat.getDrawable(context, R.drawable.ic_notification_download);