diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java index 74b9e1b8c..6717d4f57 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java @@ -458,32 +458,32 @@ public class PreferencesFragment extends PreferenceFragmentCompat private final Preference.OnPreferenceChangeListener useTorChangedListener = new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object enabled) { - if ((Boolean) enabled) { - enableProxyCheckPref.setChecked(false); - final AppCompatActivity activity = (AppCompatActivity) getActivity(); - if (!OrbotHelper.isOrbotInstalled(activity)) { - Intent intent = OrbotHelper.getOrbotInstallIntent(activity); - activity.startActivityForResult(intent, REQUEST_INSTALL_ORBOT); + @Override + public boolean onPreferenceChange(Preference preference, Object enabled) { + if ((Boolean) enabled) { + enableProxyCheckPref.setChecked(false); + final AppCompatActivity activity = (AppCompatActivity) getActivity(); + if (!OrbotHelper.isOrbotInstalled(activity)) { + Intent intent = OrbotHelper.getOrbotInstallIntent(activity); + activity.startActivityForResult(intent, REQUEST_INSTALL_ORBOT); + } + // NetCipher gets configured to use Tor in onPause() + // via a call to FDroidApp.configureProxy() + } + return true; } - // NetCipher gets configured to use Tor in onPause() - // via a call to FDroidApp.configureProxy() - } - return true; - } - }; + }; private final Preference.OnPreferenceChangeListener proxyEnabledChangedListener = new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object enabled) { - if ((Boolean) enabled) { - useTorCheckPref.setChecked(false); - } - return true; - } - }; + @Override + public boolean onPreferenceChange(Preference preference, Object enabled) { + if ((Boolean) enabled) { + useTorCheckPref.setChecked(false); + } + return true; + } + }; @Override public void onResume() { diff --git a/app/src/main/res/menu/install_history.xml b/app/src/main/res/menu/install_history.xml index d68c47518..500c521e7 100644 --- a/app/src/main/res/menu/install_history.xml +++ b/app/src/main/res/menu/install_history.xml @@ -1,12 +1,13 @@ - + + app:showAsAction="ifRoom" /> + android:title="@string/delete" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd4d4b384..4db1c7808 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -659,9 +659,9 @@ This often occurs with apps installed via Google Play or other sources, if they Updated today Your camera doesn\'t seem to have an autofocus. It might be difficult to scan the code. - Undo - Installation cancelled - + Undo + Installation cancelled + Updated %1$d day ago Updated %1$d days ago