diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-02-27 10:55:52 +0100 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-02-27 10:55:52 +0100 |
| commit | b0ca33da40d80149dd9861694a910a52a3d20eb4 (patch) | |
| tree | c04e760d643165b0aace3a72b85eeca373ec879e /OpenPGP-Keychain-API | |
| parent | 44232afe944ecb1dad0492f30283b71f7be48bd2 (diff) | |
| download | open-keychain-b0ca33da40d80149dd9861694a910a52a3d20eb4.tar.gz open-keychain-b0ca33da40d80149dd9861694a910a52a3d20eb4.tar.bz2 open-keychain-b0ca33da40d80149dd9861694a910a52a3d20eb4.zip | |
Change resource name and remove unneeded if from 44232af
Diffstat (limited to 'OpenPGP-Keychain-API')
2 files changed, 11 insertions, 13 deletions
diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml index 44d6145d4..0119831cc 100644 --- a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml @@ -2,6 +2,6 @@ <resources> <string name="openpgp_list_preference_none">None</string> - <string name="install_via">Install OpenKeychain via %s</string> + <string name="openpgp_install_openkeychain_via">Install OpenKeychain via %s</string> </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java index 6a9d85b5f..7aea8f9fa 100644 --- a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java @@ -94,18 +94,16 @@ public class OpenPgpListPreference extends DialogPreference { if (mProviderList.isEmpty()) { resInfo = getContext().getPackageManager().queryIntentActivities (MARKET_INTENT, 0); - if (!resInfo.isEmpty()) { - for (ResolveInfo resolveInfo : resInfo) { - Intent marketIntent = new Intent(MARKET_INTENT); - intent.setPackage(resolveInfo.activityInfo.packageName); - Drawable icon = resolveInfo.activityInfo.loadIcon(getContext().getPackageManager()); - String marketName = String.valueOf(resolveInfo.activityInfo.applicationInfo - .loadLabel(getContext().getPackageManager())); - String simpleName = String.format(getContext().getString(R.string - .install_via), marketName); - mProviderList.add(new OpenPgpProviderEntry(OPENKEYCHAIN_PACKAGE, simpleName, - icon, marketIntent)); - } + for (ResolveInfo resolveInfo : resInfo) { + Intent marketIntent = new Intent(MARKET_INTENT); + intent.setPackage(resolveInfo.activityInfo.packageName); + Drawable icon = resolveInfo.activityInfo.loadIcon(getContext().getPackageManager()); + String marketName = String.valueOf(resolveInfo.activityInfo.applicationInfo + .loadLabel(getContext().getPackageManager())); + String simpleName = String.format(getContext().getString(R.string + .openpgp_install_openkeychain_via), marketName); + mProviderList.add(new OpenPgpProviderEntry(OPENKEYCHAIN_PACKAGE, simpleName, + icon, marketIntent)); } } |