Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasterWanna <MasterWanna@users.noreply.github.com>2021-05-02 20:22:52 +0300
committerMasterWanna <MasterWanna@users.noreply.github.com>2021-05-02 20:22:52 +0300
commit2acbbc66ff7f57b81883d5ec25a5977fd42b1771 (patch)
treeee54acb240511dc9ae490517cfa13b0f09f381ce /app/src/main/java/it/niedermann
parentc488a32192c7e12f4053407994af50e1b1efaf6a (diff)
Fix some details in PreferencesFragment, SyncWorker and Migration_21_22
Diffstat (limited to 'app/src/main/java/it/niedermann')
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java10
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java10
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java15
3 files changed, 27 insertions, 8 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java
index f4572919..3445d94e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java
@@ -15,7 +15,6 @@ import androidx.work.WorkerParameters;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.persistence.entity.Account;
public class SyncWorker extends Worker {
@@ -44,7 +43,14 @@ public class SyncWorker extends Worker {
return Result.success();
}
- public static void update(@NonNull Context context, Boolean backgroundSync) {
+ /**
+ * Set up sync work to enabled every 15 minutes or just disabled
+ * https://github.com/stefan-niedermann/nextcloud-notes/issues/1168
+ * @param context the application
+ * @param backgroundSync the toggle result backgroundSync
+ */
+
+ public static void update(@NonNull Context context, @NonNull Boolean backgroundSync) {
deregister(context);
if (backgroundSync) {
PeriodicWorkRequest work = new PeriodicWorkRequest.Builder(SyncWorker.class, 15, TimeUnit.MINUTES)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java
index c79cb653..641b943b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java
@@ -8,6 +8,11 @@ import androidx.preference.PreferenceManager;
import androidx.room.migration.Migration;
import androidx.sqlite.db.SupportSQLiteDatabase;
+/**
+ * Enabling backgroundSync, set from {@link String} values to {@link Boolean} values
+ * https://github.com/stefan-niedermann/nextcloud-notes/issues/1168
+ */
+
public class Migration_21_22 extends Migration {
@NonNull
private final Context context;
@@ -16,10 +21,7 @@ public class Migration_21_22 extends Migration {
super(21, 22);
this.context = context;
}
- /**
- * Enabling backgroundSync, set from {@link String} values to {@link Boolean} value true
- * https://github.com/stefan-niedermann/nextcloud-deck/issues/531
- */
+
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java
index 74d37b24..91b5cc7b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java
@@ -20,8 +20,6 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil;
import it.niedermann.owncloud.notes.persistence.SyncWorker;
import it.niedermann.owncloud.notes.shared.util.DeviceCredentialUtil;
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListWidget.updateNoteListWidgets;
-
public class PreferencesFragment extends PreferenceFragmentCompat implements Branded {
private static final String TAG = PreferencesFragment.class.getSimpleName();
@@ -38,6 +36,11 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Bra
super.onCreate(savedInstanceState);
}
+ /**
+ * Turn background sync from from {@link String} values to {@link Boolean} values
+ * https://github.com/stefan-niedermann/nextcloud-notes/issues/1168
+ */
+
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.preferences);
@@ -113,6 +116,13 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Bra
}
}
+ /**
+ * Change color for backgroundSyncPref as well
+ * https://github.com/stefan-niedermann/nextcloud-deck/issues/531
+ * @param mainColor color of main brand
+ * @param textColor color of text
+ */
+
@Override
public void applyBrand(int mainColor, int textColor) {
fontPref.applyBrand(mainColor, textColor);
@@ -120,5 +130,6 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Bra
wifiOnlyPref.applyBrand(mainColor, textColor);
gridViewPref.applyBrand(mainColor, textColor);
preventScreenCapturePref.applyBrand(mainColor, textColor);
+ backgroundSyncPref.applyBrand(mainColor, textColor);
}
}