Revert "Make use of Java 10 var keyword"

This reverts commit 085bb7a94c2c459f356bc95bb20eca255128b092.

8 files changed, 43 insertions, 43 deletions

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 84ef2105..5a739b7d 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
@@ -26,14 +26,14 @@ public class Migration_10_11 extends Migration {
      */
     @Override
     public void migrate(@NonNull SupportSQLiteDatabase database) {
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        final var editor = sharedPreferences.edit();
-        final var prefs = sharedPreferences.getAll();
-        for (final var pref : prefs.entrySet()) {
-            final String key = pref.getKey();
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        Map<String, ?> prefs = sharedPreferences.getAll();
+        for (Map.Entry<String, ?> pref : prefs.entrySet()) {
+            String key = pref.getKey();
             final String DARK_THEME_KEY = "NLW_darkTheme";
             if ("darkTheme".equals(key) || key.startsWith(DARK_THEME_KEY) || key.startsWith("SNW_darkTheme")) {
-                final Boolean darkTheme = (Boolean) pref.getValue();
+                Boolean darkTheme = (Boolean) pref.getValue();
                 editor.putString(pref.getKey(), darkTheme ? DarkModeSetting.DARK.name() : DarkModeSetting.LIGHT.name());
             }
         }
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 805204f6..3d0147fb 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
@@ -47,10 +47,10 @@ public class Migration_13_14 extends Migration {
         final String SP_WIDGET_KEY = "single_note_widget";
         final String SP_ACCOUNT_ID_KEY = "SNW_accountId";
         final String SP_DARK_THEME_KEY = "SNW_darkTheme";
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        final var editor = sharedPreferences.edit();
-        final var prefs = sharedPreferences.getAll();
-        for (final var pref : prefs.entrySet()) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        Map<String, ?> prefs = sharedPreferences.getAll();
+        for (Map.Entry<String, ?> pref : prefs.entrySet()) {
             final String key = pref.getKey();
             Integer widgetId = null;
             Long noteId = null;
@@ -69,7 +69,7 @@ public class Migration_13_14 extends Migration {
                         themeMode = sharedPreferences.getBoolean(SP_DARK_THEME_KEY + widgetId, false) ? DarkModeSetting.DARK.getModeId() : DarkModeSetting.LIGHT.getModeId();
                     }
 
-                    final var migratedWidgetValues = new ContentValues();
+                    ContentValues migratedWidgetValues = new ContentValues();
                     migratedWidgetValues.put("ID", widgetId);
                     migratedWidgetValues.put("ACCOUNT_ID", accountId);
                     migratedWidgetValues.put("NOTE_ID", noteId);
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 bda4d046..a66fc0e9 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
@@ -27,7 +27,7 @@ public class Migration_14_15 extends Migration {
     @Override
     public void migrate(@NonNull SupportSQLiteDatabase db) {
         // Rename a tmp_NOTES table.
-        final String tmpTableNotes = String.format("tmp_%s", "NOTES");
+        String tmpTableNotes = String.format("tmp_%s", "NOTES");
         db.execSQL("ALTER TABLE NOTES RENAME TO " + tmpTableNotes);
         db.execSQL("CREATE TABLE NOTES ( " +
                 "ID INTEGER PRIMARY KEY AUTOINCREMENT, " +
@@ -53,14 +53,14 @@ public class Migration_14_15 extends Migration {
         createIndex(db, "CATEGORIES", "CATEGORY_ID", "CATEGORY_ACCOUNT_ID", "CATEGORY_TITLE");
         // A hashtable storing categoryTitle - categoryId Mapping
         // This is used to prevent too many searches in database
-        final var categoryTitleIdMap = new Hashtable<String, Integer>();
+        Hashtable<String, Integer> categoryTitleIdMap = new Hashtable<>();
         int id = 1;
-        final var tmpNotesCursor = db.query("SELECT * FROM " + tmpTableNotes, null);
+        Cursor tmpNotesCursor = db.query("SELECT * FROM " + tmpTableNotes, null);
         while (tmpNotesCursor.moveToNext()) {
-            final String categoryTitle = tmpNotesCursor.getString(8);
-            final int accountId = tmpNotesCursor.getInt(2);
+            String categoryTitle = tmpNotesCursor.getString(8);
+            int accountId = tmpNotesCursor.getInt(2);
             Log.e("###", accountId + "");
-            final Integer categoryId;
+            Integer categoryId;
             if (categoryTitleIdMap.containsKey(categoryTitle) && categoryTitleIdMap.get(categoryTitle) != null) {
                 categoryId = categoryTitleIdMap.get(categoryTitle);
             } else {
@@ -74,7 +74,7 @@ public class Migration_14_15 extends Migration {
                 categoryTitleIdMap.put(categoryTitle, categoryId);
             }
             // Move the data in tmp_NOTES to NOTES
-            final ContentValues values = new ContentValues();
+            ContentValues values = new ContentValues();
             values.put("ID", tmpNotesCursor.getInt(0));
             values.put("REMOTEID", tmpNotesCursor.getInt(1));
             values.put("ACCOUNT_ID", tmpNotesCursor.getInt(2));
@@ -99,7 +99,7 @@ public class Migration_14_15 extends Migration {
     }
 
     private static void createIndex(@NonNull SupportSQLiteDatabase db, @NonNull String table, @NonNull String column) {
-        final String indexName = table + "_" + column + "_idx";
+        String indexName = table + "_" + column + "_idx";
         Log.v(TAG, "Creating database index: CREATE INDEX IF NOT EXISTS " + indexName + " ON " + table + "(" + column + ")");
         db.execSQL("CREATE INDEX " + indexName + " ON " + table + "(" + column + ")");
     }
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 7be78511..48b7195b 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
@@ -51,10 +51,10 @@ public class Migration_15_16 extends Migration {
         final String SP_DARK_THEME_KEY = "NLW_darkTheme";
         final String SP_CATEGORY_KEY = "NLW_cat";
 
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        final var editor = sharedPreferences.edit();
-        final var prefs = sharedPreferences.getAll();
-        for (final var pref : prefs.entrySet()) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        Map<String, ?> prefs = sharedPreferences.getAll();
+        for (Map.Entry<String, ?> pref : prefs.entrySet()) {
             final String key = pref.getKey();
             Integer widgetId = null;
             Integer mode = null;
@@ -76,7 +76,7 @@ public class Migration_15_16 extends Migration {
 
                     if (mode == 2) {
                         final String categoryTitle = sharedPreferences.getString(SP_CATEGORY_KEY + widgetId, null);
-                        final var cursor = db.query("SELECT CATEGORY_ID FROM CATEGORIES WHERE CATEGORY_TITLE = ? AND CATEGORY_ACCOUNT_ID = ?", new String[]{categoryTitle, String.valueOf(accountId)});
+                        Cursor cursor = db.query("SELECT CATEGORY_ID FROM CATEGORIES WHERE CATEGORY_TITLE = ? AND CATEGORY_ACCOUNT_ID = ?", new String[]{categoryTitle, String.valueOf(accountId)});
                         if (cursor.moveToNext()) {
                             categoryId = cursor.getInt(0);
                         } else {
@@ -85,7 +85,7 @@ public class Migration_15_16 extends Migration {
                         cursor.close();
                     }
 
-                    final var migratedWidgetValues = new ContentValues();
+                    ContentValues migratedWidgetValues = new ContentValues();
                     migratedWidgetValues.put("ID", widgetId);
                     migratedWidgetValues.put("ACCOUNT_ID", accountId);
                     migratedWidgetValues.put("CATEGORY_ID", categoryId);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java
index 32ede8b1..d9ed2041 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java
@@ -90,8 +90,8 @@ public final class Migration_20_21 extends Migration {
     }
 
     private static void migrateAccounts(@NonNull SupportSQLiteDatabase db) {
-        final var cursor = db.query("SELECT * FROM ACCOUNTS", null);
-        final var values = new ContentValues(10);
+        final Cursor cursor = db.query("SELECT * FROM ACCOUNTS", null);
+        final ContentValues values = new ContentValues(10);
 
         final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID");
         final int COLUMN_POSITION_URL = cursor.getColumnIndex("URL");
@@ -131,8 +131,8 @@ public final class Migration_20_21 extends Migration {
     }
 
     private static void migrateCategories(@NonNull SupportSQLiteDatabase db) {
-        final var cursor = db.query("SELECT * FROM CATEGORIES", null);
-        final var values = new ContentValues(3);
+        final Cursor cursor = db.query("SELECT * FROM CATEGORIES", null);
+        final ContentValues values = new ContentValues(3);
 
         final int COLUMN_POSITION_ACCOUNT_ID = cursor.getColumnIndex("CATEGORY_ACCOUNT_ID");
         final int COLUMN_POSITION_TITLE = cursor.getColumnIndex("CATEGORY_TITLE");
@@ -148,8 +148,8 @@ public final class Migration_20_21 extends Migration {
     }
 
     private static void migrateNotes(@NonNull SupportSQLiteDatabase db) {
-        final var cursor = db.query("SELECT NOTES.*, CATEGORIES.category_title as `CAT_TITLE` FROM NOTES LEFT JOIN CATEGORIES ON NOTES.category = CATEGORIES.category_id", null);
-        final var values = new ContentValues(12);
+        final Cursor cursor = db.query("SELECT NOTES.*, CATEGORIES.category_title as `CAT_TITLE` FROM NOTES LEFT JOIN CATEGORIES ON NOTES.category = CATEGORIES.category_id", null);
+        final ContentValues values = new ContentValues(12);
 
         final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID");
         final int COLUMN_POSITION_REMOTEID = cursor.getColumnIndex("REMOTEID");
@@ -183,8 +183,8 @@ public final class Migration_20_21 extends Migration {
     }
 
     private static void migrateNotesListWidgets(@NonNull SupportSQLiteDatabase db) {
-        final var cursor = db.query("SELECT WIDGET_NOTE_LISTS.*, CATEGORIES.category_title as `CATEGORY` FROM WIDGET_NOTE_LISTS LEFT JOIN CATEGORIES ON WIDGET_NOTE_LISTS.CATEGORY_ID = CATEGORIES.category_id", null);
-        final var values = new ContentValues(5);
+        final Cursor cursor = db.query("SELECT WIDGET_NOTE_LISTS.*, CATEGORIES.category_title as `CATEGORY` FROM WIDGET_NOTE_LISTS LEFT JOIN CATEGORIES ON WIDGET_NOTE_LISTS.CATEGORY_ID = CATEGORIES.category_id", null);
+        final ContentValues values = new ContentValues(5);
 
         final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID");
         final int COLUMN_POSITION_ACCOUNT_ID = cursor.getColumnIndex("ACCOUNT_ID");
@@ -204,8 +204,8 @@ public final class Migration_20_21 extends Migration {
     }
 
     private static void migrateSingleNotesWidgets(@NonNull SupportSQLiteDatabase db) {
-        final var cursor = db.query("SELECT * FROM WIDGET_SINGLE_NOTES", null);
-        final var values = new ContentValues(4);
+        final Cursor cursor = db.query("SELECT * FROM WIDGET_SINGLE_NOTES", null);
+        final ContentValues values = new ContentValues(4);
 
         final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID");
         final int COLUMN_POSITION_ACCOUNT_ID = cursor.getColumnIndex("ACCOUNT_ID");
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 c076d38e..f4413bba 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
@@ -25,8 +25,8 @@ public class Migration_21_22 extends Migration {
 
     @Override
     public void migrate(@NonNull SupportSQLiteDatabase database) {
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        final var editor = sharedPreferences.edit();
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
         if (sharedPreferences.contains("backgroundSync")) {
             editor.remove("backgroundSync");
             if (sharedPreferences.getString("backgroundSync", "").equals("off")) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java
index 1ba08a3c..b6a7494b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java
@@ -46,8 +46,8 @@ public class Migration_22_23 extends Migration {
     }
 
     private static void sanitizeAccounts(@NonNull SupportSQLiteDatabase db) {
-        final var cursor = db.query("SELECT id, apiVersion FROM ACCOUNT", null);
-        final var values = new ContentValues(1);
+        final Cursor cursor = db.query("SELECT id, apiVersion FROM ACCOUNT", null);
+        final ContentValues values = new ContentValues(1);
 
         final int COLUMN_POSITION_ID = cursor.getColumnIndex("id");
         final int COLUMN_POSITION_API_VERSION = cursor.getColumnIndex("apiVersion");
@@ -77,10 +77,10 @@ public class Migration_22_23 extends Migration {
             }
         }
 
-        final var result = new ArrayList<ApiVersion>();
+        final Collection<ApiVersion> result = new ArrayList<>();
         for (int i = 0; i < a.length(); i++) {
             try {
-                final var version = ApiVersion.of(a.getString(i));
+                final ApiVersion version = ApiVersion.of(a.getString(i));
                 if (version.getMajor() != 0 || version.getMinor() != 0) {
                     result.add(version);
                 }
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 9b4b328f..7cdab8c0 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
@@ -24,9 +24,9 @@ public class Migration_9_10 extends Migration {
     @Override
     public void migrate(@NonNull SupportSQLiteDatabase db) {
         db.execSQL("ALTER TABLE NOTES ADD COLUMN EXCERPT INTEGER NOT NULL DEFAULT ''");
-        final var cursor = db.query("NOTES", new String[]{"ID", "CONTENT", "TITLE"});
+        Cursor cursor = db.query("NOTES", new String[]{"ID", "CONTENT", "TITLE"});
         while (cursor.moveToNext()) {
-            final var values = new ContentValues();
+            ContentValues values = new ContentValues();
             values.put("EXCERPT", NoteUtil.generateNoteExcerpt(cursor.getString(1), cursor.getString(2)));
             db.update("NOTES", OnConflictStrategy.REPLACE, values, "ID" + " = ? ", new String[]{cursor.getString(0)});
         }