Skip to content

Ability to change sync start date to the past #2772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hannesa2 wants to merge 1 commit into from
Closed

Ability to change sync start date to the past #2772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 49 additions & 4 deletions owncloudApp/src/main/java/com/owncloud/android/ui/activity/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
package com.owncloud.android.ui.activity;

import android.app.AlertDialog;
import android.app.DatePickerDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
Expand All @@ -43,11 +44,16 @@
import android.view.ViewGroup;
import android.widget.Toast;

import androidx.annotation.LayoutRes;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatDelegate;
import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.BuildConfig;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.BiometricManager;
import com.owncloud.android.datamodel.CameraUploadsSyncStorageManager;
import com.owncloud.android.datamodel.OCCameraUploadSync;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.db.PreferenceManager.CameraUploadsConfiguration;
import com.owncloud.android.files.services.CameraUploadsHandler;
Expand All @@ -56,10 +62,10 @@
import org.jetbrains.annotations.NotNull;

import java.io.File;

import androidx.annotation.LayoutRes;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatDelegate;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import timber.log.Timber;

import static com.owncloud.android.db.PreferenceManager.PREF__CAMERA_UPLOADS_DEFAULT_PATH;
Expand Down Expand Up @@ -97,6 +103,7 @@ public class Preferences extends PreferenceActivity {
private static final String PREFERENCE_FEEDBACK = "feedback";
private static final String PREFERENCE_PRIVACY_POLICY = "privacyPolicy";
private static final String PREFERENCE_LOGGER = "logger";
private static final String PREFERENCE_SYNCSTART = "sync_start";
private static final String PREFERENCE_IMPRINT = "imprint";
private static final String PREFERENCE_ABOUT_APP = "about_app";

Expand Down Expand Up @@ -132,6 +139,7 @@ public class Preferences extends PreferenceActivity {

private SharedPreferences mAppPrefs;
private Preference mLogger;
private Preference mSyncStart;

@SuppressWarnings("deprecation")
@Override
Expand Down Expand Up @@ -489,6 +497,40 @@ public void onCreate(Bundle savedInstanceState) {

return true;
});

SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd", Locale.getDefault());
CameraUploadsSyncStorageManager cameraUploadsSyncStorageManager =
new CameraUploadsSyncStorageManager(getApplicationContext().getContentResolver());
OCCameraUploadSync cameraUploadSync =
cameraUploadsSyncStorageManager.getCameraUploadSync(null, null, null);
mSyncStart = findPreference(PREFERENCE_SYNCSTART);

if (cameraUploadSync != null) {
mSyncStart.setTitle("Pictures sync: " + sdf.format(new Date(cameraUploadSync.getPicturesLastSync())));
mSyncStart.setSummary("Video sync: " + sdf.format(new Date(cameraUploadSync.getPicturesLastSync())));
} else {
mSyncStart.setTitle("Pictures sync: not set");
mSyncStart.setSummary("Video sync: not set");
}
mSyncStart.setOnPreferenceClickListener(preference -> {
final Calendar newCalendar = Calendar.getInstance();
DatePickerDialog StartTime = new DatePickerDialog(this, (view, year, monthOfYear, dayOfMonth) -> {
Calendar newDate = Calendar.getInstance();
newDate.set(year, monthOfYear, dayOfMonth);
if (cameraUploadSync != null) {
cameraUploadSync.setPicturesLastSync(newDate.getTimeInMillis());
cameraUploadSync.setVideosLastSync(newDate.getTimeInMillis());
cameraUploadsSyncStorageManager.updateCameraUploadSync(cameraUploadSync);

mSyncStart.setTitle("Pictures sync: " + sdf.format(new Date(cameraUploadSync.getPicturesLastSync())));
mSyncStart.setSummary("Video sync: " + sdf.format(new Date(cameraUploadSync.getPicturesLastSync())));
}
}, newCalendar.get(Calendar.YEAR), newCalendar.get(Calendar.MONTH), newCalendar.get(Calendar.DAY_OF_MONTH));

StartTime.show();

return true;
});
showDeveloperItems(pCategoryMore);

boolean imprintEnabled = getResources().getBoolean(R.bool.imprint_enabled);
Expand Down Expand Up @@ -544,8 +586,10 @@ private void showDeveloperItems(PreferenceCategory preferenceCategory) {
Preference pLogger = findPreference(PREFERENCE_LOGGER);
if (mAppPrefs.getInt(MainApp.CLICK_DEV_MENU, 0) >= MainApp.CLICKS_NEEDED_TO_BE_DEVELOPER && pLogger == null) {
preferenceCategory.addPreference(mLogger);
preferenceCategory.addPreference(mSyncStart);
} else if (!MainApp.Companion.isDeveloper() && pLogger != null) {
preferenceCategory.removePreference(mLogger);
preferenceCategory.removePreference(mSyncStart);
}
}

Expand Down Expand Up @@ -970,4 +1014,5 @@ private void showSimpleDialog(String message) {
.setPositiveButton(getString(android.R.string.ok), null)
.show();
}

}
4 changes: 4 additions & 0 deletions owncloudApp/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
android:id="@+id/about_app"
android:key="about_app"
android:title="@string/about_title" />
<Preference
android:id="@+id/sync_start"
android:key="sync_start"
android:title="Sync start" />
</PreferenceCategory>

</PreferenceScreen>