From e47ebda6cc1ce6e740cca9410be29568c4a45321 Mon Sep 17 00:00:00 2001 From: Bartosz Przybylski Date: Sun, 3 Jul 2016 00:19:59 +0200 Subject: [PATCH] rebase fixes --- .../android/ui/activity/Preferences.java | 36 ++++--------------- .../ui/activity/UploadFilesActivity.java | 2 +- .../android/utils/FileStorageUtils.java | 1 + 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 3f6a13a151..15f1995c74 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -21,10 +21,10 @@ */ package com.owncloud.android.ui.activity; -import android.accounts.Account; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; import android.content.Intent; +import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; @@ -32,8 +32,6 @@ import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.os.Environment; -import android.os.Handler; -import android.os.IBinder; import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; @@ -57,20 +55,15 @@ import android.widget.Toast; import com.owncloud.android.BuildConfig; import com.owncloud.android.MainApp; import com.owncloud.android.R; -import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datastorage.DataStorageProvider; import com.owncloud.android.datastorage.StoragePoint; -import com.owncloud.android.db.DbHandler; -import com.owncloud.android.files.FileOperationsHelper; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.lib.common.OwnCloudAccount; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.utils.Log_OC; -import com.owncloud.android.services.OperationsService; import com.owncloud.android.ui.PreferenceWithLongSummary; -import com.owncloud.android.ui.RadioButtonPreference; import com.owncloud.android.utils.DisplayUtils; import java.io.IOException; @@ -88,8 +81,6 @@ public class Preferences extends PreferenceActivity private static final int ACTION_SELECT_UPLOAD_PATH = 1; private static final int ACTION_SELECT_UPLOAD_VIDEO_PATH = 2; - private static final int ACTION_SELECT_STORAGE_PATH = 3; - private static final int ACTION_PERFORM_MIGRATION = 4; private static final int ACTION_REQUEST_PASSCODE = 5; private static final int ACTION_CONFIRM_PASSCODE = 6; @@ -105,7 +96,6 @@ public class Preferences extends PreferenceActivity private Preference pAboutApp; private AppCompatDelegate mDelegate; - private PreferenceCategory mAccountsPrefCategory = null; private String mUploadPath; private PreferenceCategory mPrefInstantUploadCategory; private Preference mPrefInstantUpload; @@ -120,8 +110,7 @@ public class Preferences extends PreferenceActivity private Preference mPrefInstantVideoUploadPathWiFi; private Preference mPrefInstantVideoUploadOnlyOnCharging; private String mUploadVideoPath; - - private PreferenceWithLongSummary mPrefStoragePath; + private ListPreference mPrefStoragePath; private String mStoragePath; public static class Keys { @@ -651,21 +640,6 @@ public class Preferences extends PreferenceActivity Toast.makeText(this, R.string.pass_code_removed, Toast.LENGTH_LONG).show(); } - } else if (requestCode == ACTION_SELECT_STORAGE_PATH && resultCode == RESULT_OK) { - File currentStorageDir = new File(mStoragePath); - File upcomingStorageDir = new File(data.getStringExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES)); - - if (currentStorageDir != upcomingStorageDir) { - Intent migrationIntent = new Intent(this, StorageMigrationActivity.class); - migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_SOURCE_DIR, - currentStorageDir.getAbsolutePath()); - migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR, - upcomingStorageDir.getAbsolutePath()); - startActivityForResult(migrationIntent, ACTION_PERFORM_MIGRATION); - } - } else if (requestCode == ACTION_PERFORM_MIGRATION && resultCode == RESULT_OK) { - String resultStorageDir = data.getStringExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR); - saveStoragePath(resultStorageDir); } else if (requestCode == ACTION_REQUEST_CODE_DAVDROID_SETUP && resultCode == RESULT_OK) { Toast.makeText(this, R.string.prefs_calendar_contacts_sync_setup_successful, Toast.LENGTH_LONG).show(); } } @@ -801,7 +775,10 @@ public class Preferences extends PreferenceActivity * Load upload video path set on preferences */ private void loadInstantUploadVideoPath() { - mPrefInstantVideoUploadPath.setSummary(MainApp.getStoragePath()); + SharedPreferences appPrefs = + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path)); + mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath); } /** @@ -825,4 +802,5 @@ public class Preferences extends PreferenceActivity public void onCancelMigration() { // Migration was canceled so we don't do anything } + } diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index 598397202e..1b87294e3b 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -68,7 +68,7 @@ public class UploadFilesActivity extends FileActivity implements private boolean mSelectAll = false; private LocalFileListFragment mFileListFragment; private Button mCancelBtn; - private Button mUploadBtn; + protected Button mUploadBtn; private Spinner mBehaviourSpinner; private Account mAccountOnCreation; private DialogFragment mCurrentDialog; diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java index 0ef8459d2b..4548813f16 100644 --- a/src/com/owncloud/android/utils/FileStorageUtils.java +++ b/src/com/owncloud/android/utils/FileStorageUtils.java @@ -60,6 +60,7 @@ import android.accounts.Account; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; +import android.os.Environment; import android.preference.PreferenceManager; import android.net.Uri; import android.os.StatFs;