Formatted according to latest ktlint

spacecowboy · Nov 26, 2023 · de62e7d · de62e7d
1 parent 63e5e58
commit de62e7d
Show file tree

Hide file tree

Showing 216 changed files with 9,760 additions and 8,194 deletions.
diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/crypto/AesCbcWithIntegrityTest.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/crypto/AesCbcWithIntegrityTest.kt
@@ -1,7 +1,7 @@
 package com.nononsenseapps.feeder.crypto
 
-import kotlin.test.assertEquals
 import org.junit.Test
+import kotlin.test.assertEquals
 
 class AesCbcWithIntegrityTest {
     @Test

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/legacy/LegacyDatabaseHandler.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/legacy/LegacyDatabaseHandler.kt
@@ -11,13 +11,16 @@ const val LEGACY_DATABASE_NAME = DATABASE_NAME
 class LegacyDatabaseHandler constructor(
     context: Context,
     name: String = LEGACY_DATABASE_NAME,
-    version: Int = LEGACY_DATABASE_VERSION
+    version: Int = LEGACY_DATABASE_VERSION,
 ) : SQLiteOpenHelper(context, name, null, version) {
-
     override fun onCreate(db: SQLiteDatabase) {
     }
 
-    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    override fun onUpgrade(
+        db: SQLiteDatabase,
+        oldVersion: Int,
+        newVersion: Int,
+    ) {
     }
 
     override fun onOpen(db: SQLiteDatabase) {
@@ -46,6 +49,7 @@ const val FEED_ITEM_TABLE_NAME = "FeedItem"
 // Naming the id column with an underscore is good to be consistent
 // with other Android things. This is ALWAYS needed
 const val COL_ID = "_id"
+
 // These fields can be anything you want.
 const val COL_TITLE = "title"
 const val COL_CUSTOM_TITLE = "customtitle"
@@ -63,6 +67,7 @@ const val COL_AUTHOR = "author"
 const val COL_PUBDATE = "pubdate"
 const val COL_UNREAD = "unread"
 const val COL_NOTIFIED = "notified"
+
 // These fields corresponds to columns in Feed table
 const val COL_FEED = "feed"
 const val COL_FEEDTITLE = "feedtitle"

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom10To11.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom10To11.kt
@@ -17,12 +17,13 @@ class MigrationFrom10To11 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate10to11() {
@@ -31,15 +32,15 @@ class MigrationFrom10To11 {
         db.use {
             db.execSQL(
                 """
-            INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash)
-            VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666)
+                INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash)
+                VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666)
                 """.trimIndent(),
             )
 
             db.execSQL(
                 """
-            INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id)
-            VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1)
+                INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id)
+                VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1)
                 """.trimIndent(),
             )
         }

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom11To12.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom11To12.kt
@@ -17,12 +17,13 @@ class MigrationFrom11To12 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate11to12() {
@@ -31,15 +32,15 @@ class MigrationFrom11To12 {
         db.use {
             db.execSQL(
                 """
-            INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash)
-            VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666)
+                INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash)
+                VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666)
                 """.trimIndent(),
             )
 
             db.execSQL(
                 """
-            INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time)
-            VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0)
+                INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time)
+                VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0)
                 """.trimIndent(),
             )
         }

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom12To13.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom12To13.kt
@@ -17,12 +17,13 @@ class MigrationFrom12To13 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate12to13() {
@@ -31,15 +32,15 @@ class MigrationFrom12To13 {
         db.use {
             db.execSQL(
                 """
-            INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash)
-            VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666)
+                INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash)
+                VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666)
                 """.trimIndent(),
             )
 
             db.execSQL(
                 """
-            INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
-            VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
+                INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
+                VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
                 """.trimIndent(),
             )
         }

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom13To14.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom13To14.kt
@@ -17,12 +17,13 @@ class MigrationFrom13To14 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate13to14() {
@@ -31,15 +32,15 @@ class MigrationFrom13To14 {
         db.use {
             db.execSQL(
                 """
-            INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash, fulltext_by_default)
-            VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666, 0)
+                INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash, fulltext_by_default)
+                VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666, 0)
                 """.trimIndent(),
             )
 
             db.execSQL(
                 """
-            INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
-            VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
+                INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
+                VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
                 """.trimIndent(),
             )
         }

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom14To15.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom14To15.kt
@@ -17,12 +17,13 @@ class MigrationFrom14To15 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate14to15() {
@@ -31,15 +32,15 @@ class MigrationFrom14To15 {
         db.use {
             db.execSQL(
                 """
-            INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash, fulltext_by_default, open_articles_with)
-            VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666, 0, '')
+                INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash, fulltext_by_default, open_articles_with)
+                VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666, 0, '')
                 """.trimIndent(),
             )
 
             db.execSQL(
                 """
-            INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
-            VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
+                INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
+                VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
                 """.trimIndent(),
             )
         }

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom15To16.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom15To16.kt
@@ -17,12 +17,13 @@ class MigrationFrom15To16 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate15to16() {
@@ -31,15 +32,15 @@ class MigrationFrom15To16 {
         db.use {
             db.execSQL(
                 """
-            INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash, fulltext_by_default, open_articles_with, alternate_id)
-            VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666, 0, '', 0)
+                INSERT INTO feeds(id, title, url, custom_title, tag, notify, last_sync, response_hash, fulltext_by_default, open_articles_with, alternate_id)
+                VALUES(1, 'feed', 'http://url', '', '', 0, 0, 666, 0, '', 0)
                 """.trimIndent(),
             )
 
             db.execSQL(
                 """
-            INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
-            VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
+                INSERT INTO feed_items(id, guid, title, plain_title, plain_snippet, unread, notified, feed_id, first_synced_time, primary_sort_time)
+                VALUES(8, 'http://item', 'title', 'ptitle', 'psnippet', 1, 0, 1, 0, 0)
                 """.trimIndent(),
             )
         }

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom16To17.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom16To17.kt
@@ -16,12 +16,13 @@ class MigrationFrom16To17 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate15to16() {

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom17To18.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom17To18.kt
@@ -16,12 +16,13 @@ class MigrationFrom17To18 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate15to16() {

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom18To19.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom18To19.kt
@@ -16,12 +16,13 @@ class MigrationFrom18To19 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate15to16() {

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom19To20.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom19To20.kt
@@ -17,12 +17,13 @@ class MigrationFrom19To20 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate() {

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom20To21.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFrom20To21.kt
@@ -5,11 +5,11 @@ import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -18,12 +18,13 @@ class MigrationFrom20To21 {
 
     @Rule
     @JvmField
-    val testHelper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        emptyList(),
-        FrameworkSQLiteOpenHelperFactory(),
-    )
+    val testHelper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+            emptyList(),
+            FrameworkSQLiteOpenHelperFactory(),
+        )
 
     @Test
     fun migrate() {