Merge pull request #1290 from przybylski/bug_1288

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Preferences.java

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 229f202..3f242c2 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -462,8 +462,15 @@ public class Preferences extends PreferenceActivity
         /* About App */
        pAboutApp = (Preference) findPreference("about_app");
        if (pAboutApp != null) { 
-               pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
-               pAboutApp.setSummary(String.format(getString(R.string.about_version), BuildConfig.VERSION_CODE));
+               pAboutApp.setTitle(String.format(getString(R.string.about_android),
+                                                getString(R.string.app_name)));
+           try {
+               Integer currentVersion = getPackageManager().getPackageInfo
+                  (getPackageName(), 0).versionCode;
+               pAboutApp.setSummary(String.format(getString(R.string.about_version),
+                                    currentVersion));
+           } catch (NameNotFoundException e) {
+           }
        }
 
        loadInstantUploadPath();
@@ -487,20 +494,26 @@ public class Preferences extends PreferenceActivity
             pBetaLink.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    Integer currentVersion = BuildConfig.VERSION_CODE;
-                    LoadingVersionNumberTask loadTask = new LoadingVersionNumberTask();
-                    loadTask.execute();
                     Integer latestVersion = -1;
+                    Integer currentVersion = -1;
                     try {
+                        currentVersion = getPackageManager().getPackageInfo
+                                                 (getPackageName(), 0).versionCode;
+                        LoadingVersionNumberTask loadTask = new LoadingVersionNumberTask();
+                        loadTask.execute();
                         latestVersion = loadTask.get();
                     } catch (InterruptedException | ExecutionException e) {
                         e.printStackTrace();
+                    } catch (NameNotFoundException e) {
+                        e.printStackTrace();
                     }
-                    if (latestVersion == -1) {
-                        Toast.makeText(getApplicationContext(), "No information available!", Toast.LENGTH_SHORT).show();
+                    if (latestVersion == -1 || currentVersion == -1) {
+                        Toast.makeText(getApplicationContext(), "No information available!",
+                                       Toast.LENGTH_SHORT).show();
                     }
                     if (latestVersion > currentVersion) {
-                        String betaLinkWeb = (String) getText(R.string.beta_link) + latestVersion + ".apk";
+                        String betaLinkWeb = (String) getText(R.string.beta_link) +
+                                                              latestVersion + ".apk";
                         if (betaLinkWeb != null && betaLinkWeb.length() > 0) {
                             Uri uriUrl = Uri.parse(betaLinkWeb);
                             Intent intent = new Intent(Intent.ACTION_VIEW, uriUrl);
@@ -508,7 +521,8 @@ public class Preferences extends PreferenceActivity
                             return true;
                         }
                     } else {
-                        Toast.makeText(getApplicationContext(), "No new version available!", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), "No new version available!",
+                                       Toast.LENGTH_SHORT).show();
                         return true;
                     }
                     return true;
@@ -518,7 +532,7 @@ public class Preferences extends PreferenceActivity
 
         /* Link to Beta apks */
         Preference pChangelogLink =  findPreference("changelog_link");
-        if (pChangelogLink != null){
+        if (pChangelogLink != null) {
             pChangelogLink.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
@@ -889,7 +903,7 @@ public class Preferences extends PreferenceActivity
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
-//        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
+        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
     }
 
     /**