|
@@ -34,7 +34,6 @@ import android.net.Uri;
|
|
import android.os.Build;
|
|
import android.os.Build;
|
|
import android.os.Bundle;
|
|
import android.os.Bundle;
|
|
import android.os.Environment;
|
|
import android.os.Environment;
|
|
-import android.preference.CheckBoxPreference;
|
|
|
|
import android.preference.ListPreference;
|
|
import android.preference.ListPreference;
|
|
import android.preference.Preference;
|
|
import android.preference.Preference;
|
|
import android.preference.Preference.OnPreferenceChangeListener;
|
|
import android.preference.Preference.OnPreferenceChangeListener;
|
|
@@ -70,6 +69,7 @@ import com.owncloud.android.lib.common.ExternalLinkType;
|
|
import com.owncloud.android.lib.common.OwnCloudAccount;
|
|
import com.owncloud.android.lib.common.OwnCloudAccount;
|
|
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
|
|
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
|
|
import com.owncloud.android.lib.common.utils.Log_OC;
|
|
import com.owncloud.android.lib.common.utils.Log_OC;
|
|
|
|
+import com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle;
|
|
import com.owncloud.android.utils.AnalyticsUtils;
|
|
import com.owncloud.android.utils.AnalyticsUtils;
|
|
import com.owncloud.android.utils.DisplayUtils;
|
|
import com.owncloud.android.utils.DisplayUtils;
|
|
|
|
|
|
@@ -109,13 +109,13 @@ public class Preferences extends PreferenceActivity
|
|
|
|
|
|
private String mUploadPath;
|
|
private String mUploadPath;
|
|
private PreferenceCategory mPrefInstantUploadCategory;
|
|
private PreferenceCategory mPrefInstantUploadCategory;
|
|
- private Preference mPrefInstantUpload;
|
|
|
|
|
|
+ private CheckBoxPreferenceWithLongTitle mPrefInstantUpload;
|
|
private Preference mPrefInstantUploadBehaviour;
|
|
private Preference mPrefInstantUploadBehaviour;
|
|
private Preference mPrefInstantUploadPath;
|
|
private Preference mPrefInstantUploadPath;
|
|
private Preference mPrefInstantUploadUseSubfolders;
|
|
private Preference mPrefInstantUploadUseSubfolders;
|
|
private Preference mPrefInstantPictureUploadOnlyOnCharging;
|
|
private Preference mPrefInstantPictureUploadOnlyOnCharging;
|
|
private Preference mPrefInstantUploadPathWiFi;
|
|
private Preference mPrefInstantUploadPathWiFi;
|
|
- private Preference mPrefInstantVideoUpload;
|
|
|
|
|
|
+ private CheckBoxPreferenceWithLongTitle mPrefInstantVideoUpload;
|
|
private Preference mPrefInstantVideoUploadPath;
|
|
private Preference mPrefInstantVideoUploadPath;
|
|
private Preference mPrefInstantVideoUploadUseSubfolders;
|
|
private Preference mPrefInstantVideoUploadUseSubfolders;
|
|
private Preference mPrefInstantVideoUploadPathWiFi;
|
|
private Preference mPrefInstantVideoUploadPathWiFi;
|
|
@@ -514,24 +514,21 @@ public class Preferences extends PreferenceActivity
|
|
mPrefInstantUploadUseSubfolders = findPreference("instant_upload_path_use_subfolders");
|
|
mPrefInstantUploadUseSubfolders = findPreference("instant_upload_path_use_subfolders");
|
|
mPrefInstantUploadPathWiFi = findPreference("instant_upload_on_wifi");
|
|
mPrefInstantUploadPathWiFi = findPreference("instant_upload_on_wifi");
|
|
mPrefInstantPictureUploadOnlyOnCharging = findPreference("instant_upload_on_charging");
|
|
mPrefInstantPictureUploadOnlyOnCharging = findPreference("instant_upload_on_charging");
|
|
- mPrefInstantUpload = findPreference("instant_uploading");
|
|
|
|
|
|
+ mPrefInstantUpload = (CheckBoxPreferenceWithLongTitle) findPreference("instant_uploading");
|
|
|
|
|
|
- toggleInstantPictureOptions(((SwitchPreference) mPrefInstantUpload).isChecked());
|
|
|
|
|
|
+ toggleInstantPictureOptions(mPrefInstantUpload.isChecked());
|
|
|
|
|
|
mPrefInstantUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
|
|
mPrefInstantUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
|
|
-
|
|
|
|
@Override
|
|
@Override
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
toggleInstantPictureOptions((Boolean) newValue);
|
|
toggleInstantPictureOptions((Boolean) newValue);
|
|
- toggleInstantUploadBehaviour(
|
|
|
|
- ((SwitchPreference) mPrefInstantVideoUpload).isChecked(),
|
|
|
|
- (Boolean) newValue);
|
|
|
|
|
|
+ toggleInstantUploadBehaviour(mPrefInstantVideoUpload.isChecked(), (Boolean) newValue);
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
mPrefInstantVideoUploadPath = findPreference(PreferenceKeys.INSTANT_VIDEO_UPLOAD_PATH);
|
|
mPrefInstantVideoUploadPath = findPreference(PreferenceKeys.INSTANT_VIDEO_UPLOAD_PATH);
|
|
- if (mPrefInstantVideoUploadPath != null){
|
|
|
|
|
|
+ if (mPrefInstantVideoUploadPath != null) {
|
|
|
|
|
|
mPrefInstantVideoUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
mPrefInstantVideoUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
@Override
|
|
@Override
|
|
@@ -550,24 +547,24 @@ public class Preferences extends PreferenceActivity
|
|
|
|
|
|
mPrefInstantVideoUploadUseSubfolders = findPreference("instant_video_upload_path_use_subfolders");
|
|
mPrefInstantVideoUploadUseSubfolders = findPreference("instant_video_upload_path_use_subfolders");
|
|
mPrefInstantVideoUploadPathWiFi = findPreference("instant_video_upload_on_wifi");
|
|
mPrefInstantVideoUploadPathWiFi = findPreference("instant_video_upload_on_wifi");
|
|
- mPrefInstantVideoUpload = findPreference("instant_video_uploading");
|
|
|
|
|
|
+ mPrefInstantVideoUpload = (CheckBoxPreferenceWithLongTitle) findPreference("instant_video_uploading");
|
|
mPrefInstantVideoUploadOnlyOnCharging = findPreference("instant_video_upload_on_charging");
|
|
mPrefInstantVideoUploadOnlyOnCharging = findPreference("instant_video_upload_on_charging");
|
|
- toggleInstantVideoOptions(((CheckBoxPreference) mPrefInstantVideoUpload).isChecked());
|
|
|
|
|
|
+ toggleInstantVideoOptions(mPrefInstantVideoUpload.isChecked());
|
|
mPrefInstantVideoUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
|
|
mPrefInstantVideoUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
|
|
@Override
|
|
@Override
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
toggleInstantVideoOptions((Boolean) newValue);
|
|
toggleInstantVideoOptions((Boolean) newValue);
|
|
toggleInstantUploadBehaviour(
|
|
toggleInstantUploadBehaviour(
|
|
(Boolean) newValue,
|
|
(Boolean) newValue,
|
|
- ((CheckBoxPreference) mPrefInstantUpload).isChecked());
|
|
|
|
|
|
+ mPrefInstantUpload.isChecked());
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
mPrefInstantUploadBehaviour = findPreference("prefs_instant_behaviour");
|
|
mPrefInstantUploadBehaviour = findPreference("prefs_instant_behaviour");
|
|
toggleInstantUploadBehaviour(
|
|
toggleInstantUploadBehaviour(
|
|
- ((CheckBoxPreference) mPrefInstantVideoUpload).isChecked(),
|
|
|
|
- ((CheckBoxPreference) mPrefInstantUpload).isChecked());
|
|
|
|
|
|
+ mPrefInstantVideoUpload.isChecked(),
|
|
|
|
+ mPrefInstantUpload.isChecked());
|
|
|
|
|
|
loadInstantUploadPath();
|
|
loadInstantUploadPath();
|
|
loadInstantUploadVideoPath();
|
|
loadInstantUploadVideoPath();
|