From 216695285a197018e6dcab152725845496152b93 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 27 Feb 2018 22:38:54 -0700 Subject: [PATCH 1/2] fix int overflow --- .../fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 46539ef38..c1e5b510d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -387,12 +387,12 @@ public class AppDetailsRecyclerViewAdapter progressLabel.setContentDescription(context.getString(R.string.downloading)); progressPercent.setText(""); } else if (totalBytes > 0 && bytesDownloaded >= 0) { - float percent = bytesDownloaded * 100 / totalBytes; + float percent = (float) bytesDownloaded / totalBytes; progressLabel.setText(Utils.getFriendlySize(bytesDownloaded) + " / " + Utils.getFriendlySize(totalBytes)); progressLabel.setContentDescription(context.getString(R.string.app__tts__downloading_progress, (int) percent)); NumberFormat format = NumberFormat.getPercentInstance(); format.setMaximumFractionDigits(0); - progressPercent.setText(format.format(percent / 100)); + progressPercent.setText(format.format(percent)); } else if (bytesDownloaded >= 0) { progressLabel.setText(Utils.getFriendlySize(bytesDownloaded)); progressLabel.setContentDescription(context.getString(R.string.downloading)); From 1facc7d07c68be562e35c67990cd9f739753d601 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 27 Feb 2018 22:40:19 -0700 Subject: [PATCH 2/2] rename version layout --- .../org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java | 2 +- .../layout/{apklistitem.xml => app_details2_version_item.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/src/main/res/layout/{apklistitem.xml => app_details2_version_item.xml} (100%) 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 c1e5b510d..aea76f8ab 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -243,7 +243,7 @@ public class AppDetailsRecyclerViewAdapter return new VersionsViewHolder(versionsView); } case VIEWTYPE_VERSION: - View version = inflater.inflate(R.layout.apklistitem, parent, false); + View version = inflater.inflate(R.layout.app_details2_version_item, parent, false); return new VersionViewHolder(version); } return null; diff --git a/app/src/main/res/layout/apklistitem.xml b/app/src/main/res/layout/app_details2_version_item.xml similarity index 100% rename from app/src/main/res/layout/apklistitem.xml rename to app/src/main/res/layout/app_details2_version_item.xml