diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java index c6ef14113..14a343f26 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java @@ -309,7 +309,7 @@ public class SwapSuccessView extends SwapView implements LoaderManager.LoaderCal nameView.setText(app.name); } - ImageLoader.getInstance().displayImage(app.iconUrl, iconView, Utils.getRepoAppDisplayImageOptions()); + ImageLoader.getInstance().displayImage(app.getIconUrl(iconView.getContext()), iconView, Utils.getRepoAppDisplayImageOptions()); if (app.hasUpdates()) { btnInstall.setText(R.string.menu_upgrade); diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java index 27c7525e9..ac5149a69 100644 --- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java @@ -493,7 +493,7 @@ class NotificationHelper { private Bitmap getLargeIconForEntry(AppUpdateStatusManager.AppUpdateStatus entry) { final Point largeIconSize = getLargeIconSize(); Bitmap iconLarge = null; - if (TextUtils.isEmpty(entry.app.iconUrl)) { + if (TextUtils.isEmpty(entry.app.getIconUrl(context))) { return null; } else if (entry.status == AppUpdateStatusManager.Status.Downloading || entry.status == AppUpdateStatusManager.Status.Installing) { @@ -505,12 +505,12 @@ class NotificationHelper { downloadIcon.draw(canvas); } return bitmap; - } else if (DiskCacheUtils.findInCache(entry.app.iconUrl, ImageLoader.getInstance().getDiskCache()) != null) { + } else if (DiskCacheUtils.findInCache(entry.app.getIconUrl(context), ImageLoader.getInstance().getDiskCache()) != null) { iconLarge = ImageLoader.getInstance().loadImageSync( - entry.app.iconUrl, new ImageSize(largeIconSize.x, largeIconSize.y)); + entry.app.getIconUrl(context), new ImageSize(largeIconSize.x, largeIconSize.y)); } else { // Load it for later! - ImageLoader.getInstance().loadImage(entry.app.iconUrl, new ImageSize(largeIconSize.x, largeIconSize.y), new ImageLoadingListener() { + ImageLoader.getInstance().loadImage(entry.app.getIconUrl(context), new ImageSize(largeIconSize.x, largeIconSize.y), new ImageLoadingListener() { AppUpdateStatusManager.AppUpdateStatus entry; @@ -536,8 +536,8 @@ class NotificationHelper { AppUpdateStatusManager.AppUpdateStatus oldEntry = appUpdateStatusManager.get(entry.getCanonicalUrl()); if (oldEntry != null && oldEntry.app != null - && oldEntry.app.iconUrl != null - && DiskCacheUtils.findInCache(oldEntry.app.iconUrl, ImageLoader.getInstance().getDiskCache()) != null) { + && oldEntry.app.getIconUrl(context) != null + && DiskCacheUtils.findInCache(oldEntry.app.getIconUrl(context), ImageLoader.getInstance().getDiskCache()) != null) { createNotification(oldEntry); // Update with new image! } } diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index f86bb71ba..d6f9c76a7 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -19,9 +19,11 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; + import org.apache.commons.io.filefilter.RegexFileFilter; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; @@ -217,7 +219,7 @@ public class App extends ValueObject implements Comparable, Parcelable { /** * URL to download the app's icon. */ - public String iconUrl; + private String iconUrl; public static String getIconName(String packageName, int versionCode) { return packageName + "_" + versionCode + ".png"; @@ -567,6 +569,10 @@ public class App extends ValueObject implements Comparable, Parcelable { if (!TextUtils.isEmpty(value)) { description = formatDescription(value); } + value = getLocalizedGraphicsEntry(localized, localesToUse, "icon"); + if (!TextUtils.isEmpty(value)) { + iconUrl = value; + } featureGraphic = getLocalizedGraphicsEntry(localized, localesToUse, "featureGraphic"); promoGraphic = getLocalizedGraphicsEntry(localized, localesToUse, "promoGraphic"); @@ -656,6 +662,23 @@ public class App extends ValueObject implements Comparable, Parcelable { return description.replace("\n", "
"); } + public String getIconUrl(Context context) { + Repo repo = RepoProvider.Helper.findById(context, repoId); + if (TextUtils.isEmpty(iconUrl)) { + if (TextUtils.isEmpty(icon)){ + return null; + } + String iconsDir; + if (repo.version >= Repo.VERSION_DENSITY_SPECIFIC_ICONS) { + iconsDir = Utils.getIconsDir(context, 1.0); + } else { + iconsDir = Utils.FALLBACK_ICONS_DIR; + } + return repo.address + iconsDir + icon; + } + return repo.address + "/" + packageName + "/" + iconUrl; + } + public String getFeatureGraphicUrl(Context context) { if (TextUtils.isEmpty(featureGraphic)) { return null; diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java index 7cd30f4f9..1b1939674 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java @@ -1007,8 +1007,6 @@ public class AppProvider extends FDroidProvider { updatePreferredMetadata(); updateCompatibleFlags(); updateSuggestedFromUpstream(null); - updateSuggestedFromLatest(null); - updateIconUrls(); } /** @@ -1182,51 +1180,4 @@ public class AppProvider extends FDroidProvider { LoggingQuery.execSQL(db(), updateSql, args); } - - private void updateIconUrls() { - final String appTable = getTableName(); - final String iconsDir = Utils.getIconsDir(getContext(), 1.0); - String repoVersion = Integer.toString(Repo.VERSION_DENSITY_SPECIFIC_ICONS); - Utils.debugLog(TAG, "Updating icon paths for apps belonging to repos with version >= " + repoVersion); - Utils.debugLog(TAG, "Using icons dir '" + iconsDir + "'"); - String query = getIconUpdateQuery(appTable); - final String[] params = { - repoVersion, iconsDir, Utils.FALLBACK_ICONS_DIR, - }; - db().execSQL(query, params); - } - - /** - * Returns a query which requires two parameters to be bound. These are (in order): - * 1) The repo version that introduced density specific icons - * 2) The dir to density specific icons for the current device. - */ - private static String getIconUpdateQuery(String app) { - - final String repo = RepoTable.NAME; - - final String iconUrlQuery = - "SELECT " + - - // Concatenate (using the "||" operator) the address, the - // icons directory (bound to the ? as the second parameter - // when executing the query) and the icon path. - "( " + - repo + "." + RepoTable.Cols.ADDRESS + - " || " + - - // If the repo has the relevant version, then use a more - // intelligent icons dir, otherwise revert to the default - // one - " CASE WHEN " + repo + "." + RepoTable.Cols.VERSION + " >= ? THEN ? ELSE ? END " + - - " || " + - app + "." + Cols.ICON + - ") " + - " FROM " + - repo + " WHERE " + repo + "." + RepoTable.Cols._ID + " = " + app + "." + Cols.REPO_ID; - return "UPDATE " + app + " SET " - + Cols.ICON_URL + " = ( " + iconUrlQuery + " )"; - } - } diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 11deee710..ec3cf3563 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -227,7 +227,7 @@ public class DBHelper extends SQLiteOpenHelper { + "primary key(" + ApkAntiFeatureJoinTable.Cols.APK_ID + ", " + ApkAntiFeatureJoinTable.Cols.ANTI_FEATURE_ID + ") " + " );"; - protected static final int DB_VERSION = 83; + protected static final int DB_VERSION = 84; private final Context context; @@ -456,6 +456,15 @@ public class DBHelper extends SQLiteOpenHelper { addIsLocalized(db, oldVersion); addTranslation(db, oldVersion); switchRepoArchivePriorities(db, oldVersion); + deleteOldIconUrls(db, oldVersion); + } + + private void deleteOldIconUrls(SQLiteDatabase db, int oldVersion) { + if (oldVersion >= 84) { + return; + } + Utils.debugLog(TAG, "Clearing iconUrl field to enable localized icons on next update"); + db.execSQL("UPDATE " + AppMetadataTable.NAME + " SET " + AppMetadataTable.Cols.ICON_URL + "= NULL"); } private void switchRepoArchivePriorities(SQLiteDatabase db, int oldVersion) { diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java index fb450594f..051884d78 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java @@ -76,7 +76,7 @@ public class InstallConfirmActivity extends FragmentActivity implements OnCancel TabHost tabHost = (TabHost) findViewById(android.R.id.tabhost); appName.setText(app.name); - ImageLoader.getInstance().displayImage(app.iconUrl, appIcon, + ImageLoader.getInstance().displayImage(app.getIconUrl(this), appIcon, Utils.getRepoAppDisplayImageOptions()); tabHost.setup(); diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java index 4af3ea8f5..94008a507 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java @@ -149,7 +149,7 @@ public class AppDetailsActivity extends AppCompatActivity DisplayImageOptions displayImageOptions = Utils.getRepoAppDisplayImageOptions(); String featureGraphicUrl = app.getFeatureGraphicUrl(this); featureImage.loadImageAndDisplay(ImageLoader.getInstance(), displayImageOptions, - featureGraphicUrl, app.iconUrl); + featureGraphicUrl, app.getIconUrl(this)); } private String getPackageNameFromIntent(Intent intent) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 6c8b24cb8..6304b9574 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -480,7 +480,7 @@ public class AppDetailsRecyclerViewAdapter } public void bindModel() { - ImageLoader.getInstance().displayImage(app.iconUrl, iconView, Utils.getRepoAppDisplayImageOptions()); + ImageLoader.getInstance().displayImage(app.getIconUrl(iconView.getContext()), iconView, Utils.getRepoAppDisplayImageOptions()); titleView.setText(app.name); if (!TextUtils.isEmpty(app.authorName)) { authorView.setText(context.getString(R.string.by_author_format, app.authorName)); diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java index ab30d3a6f..93cb0717b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java @@ -191,7 +191,7 @@ public abstract class AppListItemController extends RecyclerView.ViewHolder { if (actionButton != null) actionButton.setEnabled(true); - if (app.iconUrl == null) { + if (app.getIconUrl(icon.getContext()) == null) { try { icon.setImageDrawable(activity.getPackageManager().getApplicationIcon(app.packageName)); } catch (PackageManager.NameNotFoundException e) { @@ -201,7 +201,7 @@ public abstract class AppListItemController extends RecyclerView.ViewHolder { : null); } } else { - ImageLoader.getInstance().displayImage(app.iconUrl, icon, Utils.getRepoAppDisplayImageOptions()); + ImageLoader.getInstance().displayImage(app.getIconUrl(icon.getContext()), icon, Utils.getRepoAppDisplayImageOptions()); } // Figures out the current install/update/download/etc status for the app we are viewing. diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java index ee1c87553..bb0c3cc02 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java @@ -96,7 +96,7 @@ public class AppCardController extends RecyclerView.ViewHolder } } - ImageLoader.getInstance().displayImage(app.iconUrl, icon, Utils.getRepoAppDisplayImageOptions()); + ImageLoader.getInstance().displayImage(app.getIconUrl(icon.getContext()), icon, Utils.getRepoAppDisplayImageOptions()); } private boolean isConsideredNew(@NonNull App app) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java index f06e25669..d2eab3b16 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java @@ -154,6 +154,8 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME, Schema.AppMetadataTable.Cols.SUMMARY, Schema.AppMetadataTable.Cols.ICON_URL, + Schema.AppMetadataTable.Cols.ICON, + Schema.AppMetadataTable.Cols.REPO_ID, }, null, null, @@ -167,7 +169,7 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade int topAppsId = currentCategory.hashCode(); int countAllAppsId = topAppsId + 1; - // Anything other than these IDs indicates that the loader which just finished finished + // Anything other than these IDs indicates that the loader which just finished // is no longer the one this view holder is interested in, due to the user having // scrolled away already during the asynchronous query being run. if (loader.getId() == topAppsId) { diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java index 195a1c262..b2d625278 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java @@ -68,7 +68,7 @@ public class AppIconsTest extends MultiIndexUpdaterTest { App app = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(), "org.adaway", new String[]{Schema.AppMetadataTable.Cols.ICON_URL}); - assertEquals(app.iconUrl, expectedUrl); + assertEquals(app.getIconUrl(context), expectedUrl); } }