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

Change inconsistent 'Upgrade' to 'Update'

Browse Source 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
This commit is contained in:
Jan-Christoph Borchardt 2018-10-21 13:31:50 +02:00 committed by Hans-Christoph Steiner
parent 5f660501e3
commit 09a7ec3fd3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -1101,7 +1101,7 @@ public class AppDetailsRecyclerViewAdapter
api.setText(getApiText(apk)); api.setText(getApiText(apk));
// Figuring out whether to show Install/Upgrade button or Downgrade button // Figuring out whether to show Install/Update button or Downgrade button
buttonDowngrade.setVisibility(View.GONE); buttonDowngrade.setVisibility(View.GONE);
buttonInstallUpgrade.setVisibility(View.GONE); buttonInstallUpgrade.setVisibility(View.GONE);
buttonInstallUpgrade.setText(context.getString(R.string.menu_install)); buttonInstallUpgrade.setText(context.getString(R.string.menu_install));
@ -1109,7 +1109,7 @@ public class AppDetailsRecyclerViewAdapter
if (isAppInstalled && !isApkInstalled) { if (isAppInstalled && !isApkInstalled) {
if (apk.versionCode > app.installedVersionCode) { if (apk.versionCode > app.installedVersionCode) {
// Change the label to indicate that pressing this // Change the label to indicate that pressing this
// button will result in upgrading the installed app // button will result in updating the installed app
buttonInstallUpgrade.setText(R.string.menu_upgrade); buttonInstallUpgrade.setText(R.string.menu_upgrade);
} else if (apk.versionCode < app.installedVersionCode) { } else if (apk.versionCode < app.installedVersionCode) {
// The Downgrade button should be shown in this case // The Downgrade button should be shown in this case

2
app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
View File

@ -67,7 +67,7 @@ public class KnownVulnAppListItemController extends AppListItemController {
Apk installedApk = app.getInstalledApk(activity); Apk installedApk = app.getInstalledApk(activity);
if (installedApk == null) { if (installedApk == null) {
throw new IllegalStateException( throw new IllegalStateException(
"Tried to upgrade or uninstall app with known vulnerability but it doesn't seem to be installed"); "Tried to update or uninstall app with known vulnerability but it doesn't seem to be installed");
} }
Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(activity, app); Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(activity, app);

2
app/src/main/res/layout/app_details2_header.xml
View File

@ -135,7 +135,7 @@
android:layout_toStartOf="@id/progress_cancel" /> android:layout_toStartOf="@id/progress_cancel" />
</RelativeLayout> </RelativeLayout>
<!-- Install, Uninstall, Upgrade, Open buttons --> <!-- Install, Uninstall, Update, Open buttons -->
<LinearLayout <LinearLayout
android:id="@+id/button_layout" android:id="@+id/button_layout"
android:layout_width="match_parent" android:layout_width="match_parent"

4
app/src/main/res/values/strings.xml
View File

@ -122,7 +122,7 @@ This often occurs with apps installed via Google Play or other sources, if they
<string name="updates__tts__download_updates_for_all_apps">Download all updates</string> <string name="updates__tts__download_updates_for_all_apps">Download all updates</string>
<string name="updates__app_with_known_vulnerability__prompt_uninstall">We found a vulnerability with %1$s. We recommend uninstalling this app immediately.</string> <string name="updates__app_with_known_vulnerability__prompt_uninstall">We found a vulnerability with %1$s. We recommend uninstalling this app immediately.</string>
<string name="updates__app_with_known_vulnerability__prompt_upgrade">We found a vulnerability with %1$s. We recommend upgrading to the newest version immediately.</string> <string name="updates__app_with_known_vulnerability__prompt_upgrade">We found a vulnerability with %1$s. We recommend updating to the newest version immediately.</string>
<string name="updates__app_with_known_vulnerability__ignore">Ignore</string> <string name="updates__app_with_known_vulnerability__ignore">Ignore</string>
<string name="updates__hide_updateable_apps">Hide apps</string> <string name="updates__hide_updateable_apps">Hide apps</string>
@ -188,7 +188,7 @@ This often occurs with apps installed via Google Play or other sources, if they
<string name="menu_video">Video</string> <string name="menu_video">Video</string>
<string name="menu_license">License: %s</string> <string name="menu_license">License: %s</string>
<string name="menu_source">Source Code</string> <string name="menu_source">Source Code</string>
<string name="menu_upgrade">Upgrade</string> <string name="menu_upgrade">Update</string>
<string name="menu_downgrade">Downgrade</string> <string name="menu_downgrade">Downgrade</string>
<string name="menu_donate">Donate</string> <string name="menu_donate">Donate</string>
<string name="menu_bitcoin">Bitcoin</string> <string name="menu_bitcoin">Bitcoin</string>