Merge pull request #1677 from xXSTrikeXx/patch-1

Remove Corrupt Account Warning

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -43,13 +43,11 @@ import android.text.TextUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeType;
 
@@ -692,8 +690,6 @@ public class FileContentProvider extends ContentProvider {
             // Create filesystem table
             createFileSystemTable(db);
 
-            PreferenceManager.getDefaultSharedPreferences(getContext()).edit()
-                    .putBoolean(FileDisplayActivity.KEY_SHOW_ACCOUNT_WARNING, false).apply();
         }
 
         @Override

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

@@ -124,8 +124,7 @@ import static com.owncloud.android.db.PreferenceManager.getSortOrder;
 public class FileDisplayActivity extends HookActivity
         implements FileFragment.ContainerActivity,
         OnEnforceableRefreshListener, SortingOrderDialogFragment.OnSortingOrderListener {
-    public static final String KEY_SHOW_ACCOUNT_WARNING = "SHOW_ACCOUNT_WARNING";
-
+ 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
     private DownloadFinishReceiver mDownloadFinishReceiver;
@@ -275,7 +274,6 @@ public class FileDisplayActivity extends HookActivity
         // always AFTER setContentView(...) in onCreate(); to work around bug in its implementation
 
         upgradeNotificationForInstantUpload();
-        upgradeNotificationForCorruptAccounts();
     }
 
     /**
@@ -324,45 +322,6 @@ public class FileDisplayActivity extends HookActivity
         }
     }
 
-    /**
-     * TODO: remove after 2.0.0 final release
-     */
-    private void upgradeNotificationForCorruptAccounts() {
-        boolean showWarning = PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean(KEY_SHOW_ACCOUNT_WARNING, true);
-        int version = getVersion();
-
-        // check show warning, version > 1.4.3 and <= 2.0.0RCx
-        if (showWarning && version > 10040299 && version < 20000099) {
-            final Context context = this;
-
-            // show info pop-up
-            new AlertDialog.Builder(this, R.style.Theme_ownCloud_Dialog)
-                    .setTitle(R.string.common_warning)
-                    .setMessage(R.string.corrupt_account_info)
-                    .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            dialog.dismiss();
-                            PreferenceManager.getDefaultSharedPreferences(context)
-                                    .edit().putBoolean(KEY_SHOW_ACCOUNT_WARNING, false).apply();
-                        }
-                    })
-                    .setIcon(R.drawable.ic_warning)
-                    .setCancelable(false)
-                    .show();
-        }
-    }
-
-    public int getVersion() {
-        int version = 0;
-        try {
-            version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
-        } catch (PackageManager.NameNotFoundException e) {
-            return version;
-        }
-        return version;
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            String permissions[], int[] grantResults) {

src/main/res/values/strings.xml

@@ -703,8 +703,6 @@
     <string name="foreground_service_upload">Uploading files&#8230;</string>
     <string name="foreground_service_download">Downloading files&#8230;</string>
 
-    <string name="common_warning" translatable="false">Warning</string>
-    <string name="corrupt_account_info" translatable="false">Accounts have been corrupted in case you have been using a release candidate of 2.0.0 between RC1 and RC5.\n\nWe are sorry to tell you that you need to remove the Nextcloud accounts from your device and need to re-login again completely in order to get fully working login-sessions on this device!</string>
     <string name="prefs_sourcecode">Get source code</string>
     <string name="prefs_license">License</string>
     <string name="prefs_gpl_v2" translatable="false">GNU General Public License, version 2</string>