From a2718c397ab439bfd5f4f3f225d428f92ca4275b Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Mon, 22 Jun 2020 13:59:07 +0200 Subject: Refactor packages to match actual use case --- .../owncloud/notes/persistence/migration/Migration_10_11.java | 2 +- .../owncloud/notes/persistence/migration/Migration_11_12.java | 2 +- .../owncloud/notes/persistence/migration/Migration_12_13.java | 2 +- .../owncloud/notes/persistence/migration/Migration_13_14.java | 2 +- .../owncloud/notes/persistence/migration/Migration_14_15.java | 2 +- .../owncloud/notes/persistence/migration/Migration_15_16.java | 2 +- .../owncloud/notes/persistence/migration/Migration_4_5.java | 4 +--- .../owncloud/notes/persistence/migration/Migration_6_7.java | 2 +- .../owncloud/notes/persistence/migration/Migration_7_8.java | 2 +- .../owncloud/notes/persistence/migration/Migration_8_9.java | 6 +++--- .../owncloud/notes/persistence/migration/Migration_9_10.java | 2 +- 11 files changed, 13 insertions(+), 15 deletions(-) (limited to 'app/src/main/java/it/niedermann/owncloud/notes/persistence/migration') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java index 82a627aa..4d45a3ce 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java @@ -8,7 +8,7 @@ import androidx.preference.PreferenceManager; import java.util.Map; -import it.niedermann.owncloud.notes.android.DarkModeSetting; +import it.niedermann.owncloud.notes.preferences.DarkModeSetting; public class Migration_10_11 { /** diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_11_12.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_11_12.java index 82a9984e..6fd531c9 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_11_12.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_11_12.java @@ -5,7 +5,7 @@ import android.database.sqlite.SQLiteDatabase; import androidx.annotation.NonNull; -import it.niedermann.owncloud.notes.model.ApiVersion; +import it.niedermann.owncloud.notes.shared.model.ApiVersion; import it.niedermann.owncloud.notes.persistence.CapabilitiesWorker; public class Migration_11_12 { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_12_13.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_12_13.java index 895a59a1..77954c3f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_12_13.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_12_13.java @@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase; import androidx.annotation.NonNull; import androidx.work.WorkManager; -import it.niedermann.owncloud.notes.model.Capabilities; +import it.niedermann.owncloud.notes.shared.model.Capabilities; public class Migration_12_13 { /** diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java index d69396d3..66a2f643 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java @@ -11,7 +11,7 @@ import androidx.preference.PreferenceManager; import java.util.Map; -import it.niedermann.owncloud.notes.android.DarkModeSetting; +import it.niedermann.owncloud.notes.preferences.DarkModeSetting; public class Migration_13_14 { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java index b025bbaa..e69c8ff1 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java @@ -7,7 +7,7 @@ import android.util.Log; import java.util.Hashtable; -import it.niedermann.owncloud.notes.util.DatabaseIndexUtil; +import it.niedermann.owncloud.notes.shared.util.DatabaseIndexUtil; public class Migration_14_15 { /** diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java index 396f29e1..49056239 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java @@ -12,7 +12,7 @@ import androidx.preference.PreferenceManager; import java.util.Map; -import it.niedermann.owncloud.notes.android.DarkModeSetting; +import it.niedermann.owncloud.notes.preferences.DarkModeSetting; public class Migration_15_16 { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_4_5.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_4_5.java index 612ed1cb..aa807944 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_4_5.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_4_5.java @@ -4,8 +4,6 @@ import android.database.sqlite.SQLiteDatabase; import androidx.annotation.NonNull; -import it.niedermann.owncloud.notes.model.DBStatus; - public class Migration_4_5 { /** * Differentiate between local id and remote id @@ -13,6 +11,6 @@ public class Migration_4_5 { public Migration_4_5(@NonNull SQLiteDatabase db) { db.execSQL("ALTER TABLE NOTES ADD COLUMN REMOTEID INTEGER"); db.execSQL("UPDATE NOTES SET REMOTEID=ID WHERE (REMOTEID IS NULL OR REMOTEID=0) AND STATUS!=?", new String[]{"LOCAL_CREATED"}); - db.execSQL("UPDATE NOTES SET REMOTEID=0, STATUS=? WHERE STATUS=?", new String[]{DBStatus.LOCAL_EDITED.getTitle(), "LOCAL_CREATED"}); + db.execSQL("UPDATE NOTES SET REMOTEID=0, STATUS=? WHERE STATUS=?", new String[]{"LOCAL_EDITED", "LOCAL_CREATED"}); } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_6_7.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_6_7.java index 399d6f40..e7d0eadd 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_6_7.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_6_7.java @@ -4,7 +4,7 @@ import android.database.sqlite.SQLiteDatabase; import androidx.annotation.NonNull; -import it.niedermann.owncloud.notes.util.DatabaseIndexUtil; +import it.niedermann.owncloud.notes.shared.util.DatabaseIndexUtil; public class Migration_6_7 { /** diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_7_8.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_7_8.java index 9a968fe1..d1fd40c0 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_7_8.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_7_8.java @@ -4,7 +4,7 @@ import android.database.sqlite.SQLiteDatabase; import androidx.annotation.NonNull; -import it.niedermann.owncloud.notes.util.DatabaseIndexUtil; +import it.niedermann.owncloud.notes.shared.util.DatabaseIndexUtil; public class Migration_7_8 { public Migration_7_8(@NonNull SQLiteDatabase db) { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_8_9.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_8_9.java index 31957fc0..03e171f3 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_8_9.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_8_9.java @@ -15,9 +15,9 @@ import androidx.preference.PreferenceManager; import java.net.MalformedURLException; import java.net.URL; -import it.niedermann.owncloud.notes.android.appwidget.NoteListWidget; -import it.niedermann.owncloud.notes.android.appwidget.SingleNoteWidget; -import it.niedermann.owncloud.notes.util.DatabaseIndexUtil; +import it.niedermann.owncloud.notes.widget.notelist.NoteListWidget; +import it.niedermann.owncloud.notes.widget.singlenote.SingleNoteWidget; +import it.niedermann.owncloud.notes.shared.util.DatabaseIndexUtil; public class Migration_8_9 { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java index c5bf2c02..b17b8675 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java @@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase; import androidx.annotation.NonNull; -import it.niedermann.owncloud.notes.util.NoteUtil; +import it.niedermann.owncloud.notes.shared.util.NoteUtil; public class Migration_9_10 { /** -- cgit v1.2.3