Fix merge

Signed-off-by: Mario Danic <mario@lovelyhq.com>

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -601,54 +601,6 @@ public class Preferences extends PreferenceActivity
         loadExternalSettingLinks(preferenceCategoryMore);
 
         loadStoragePath();
-
-        /* Link to dev apks */
-        Preference pDevLink = findPreference("dev_link");
-        if (pDevLink != null) {
-            pDevLink.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    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 | NameNotFoundException e) {
-                        Log_OC.e(TAG, "Error detecting app version", e);
-                    }
-                    if (latestVersion == -1 || currentVersion == -1) {
-                        Toast.makeText(getApplicationContext(), "No information available!", Toast.LENGTH_SHORT).show();
-                    }
-                    if (latestVersion > currentVersion) {
-                        String devApkLink = (String) getText(R.string.dev_link) + latestVersion + ".apk";
-                        Uri uriUrl = Uri.parse(devApkLink);
-                        Intent intent = new Intent(Intent.ACTION_VIEW, uriUrl);
-                        startActivity(intent);
-                        return true;
-                    } else {
-                        Toast.makeText(getApplicationContext(), "No new version available!", Toast.LENGTH_SHORT).show();
-                        return true;
-                    }
-                }
-            });
-        }
-
-        /* Link to dev changelog */
-        Preference pChangelogLink = findPreference("changelog_link");
-        if (pChangelogLink != null) {
-            pChangelogLink.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    String devChangelogLink = getString(R.string.dev_changelog);
-                    Uri uriUrl = Uri.parse(devChangelogLink);
-                    Intent intent = new Intent(Intent.ACTION_VIEW, uriUrl);
-                    startActivity(intent);
-                    return true;
-                }
-            });
-        }
     }
 
     private void launchDavDroidLogin()
@@ -1028,25 +980,4 @@ public class Preferences extends PreferenceActivity
     public void onCancelMigration() {
         // Migration was canceled so we don't do anything
     }
-
-    /**
-     * Class for loading the version number
-     */
-    private class LoadingVersionNumberTask extends AsyncTask<Void, Void, Integer> {
-        protected Integer doInBackground(Void... args) {
-            try {
-                URL url = new URL(getString(R.string.dev_latest));
-                BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
-
-                Integer latestVersion = Integer.parseInt(in.readLine());
-                in.close();
-
-                return latestVersion;
-
-            } catch (IOException e) {
-                Log_OC.e(TAG, "Error loading version number", e);
-            }
-            return -1;
-        }
-    }
 }