From: jabarros Date: Fri, 12 Dec 2014 09:05:49 +0000 (+0100) Subject: Merge pull request #766 from owncloud/feedbackWithVersionNumber X-Git-Tag: oc-android-1.7.0_signed~78 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4e2f886b44df528760924d3c6d03ec811e960901 Merge pull request #766 from owncloud/feedbackWithVersionNumber Email from feedback contains version number --- 4e2f886b44df528760924d3c6d03ec811e960901 diff --cc src/com/owncloud/android/ui/activity/Preferences.java index 04a4c7af,a677533d..1d80a703 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@@ -286,18 -268,8 +297,12 @@@ public class Preferences extends Sherlo pAboutApp = (Preference) findPreference("about_app"); if (pAboutApp != null) { pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name))); - PackageInfo pkg; - try { - pkg = getPackageManager().getPackageInfo(getPackageName(), 0); - pAboutApp.setSummary(String.format(getString(R.string.about_version), pkg.versionName)); - } catch (NameNotFoundException e) { - Log_OC.e(TAG, "Error while showing about dialog", e); - } + pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion)); } + + loadInstantUploadPath(); + loadInstantUploadVideoPath(); + } @Override