Merge branch 'master' into email-error

nbransby · web-flow · commit 753ba1087139 · 2024-04-18T11:44:05.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -111,41 +111,41 @@ publishing {
 
             pom {
                 name.set("firebase-java-sdk")
-                 description.set("The Firebase Java SDK is a pure java port of the Firebase Android SDK to run in clientside java environments such as the desktop.")
-                 url.set("https://github.com/GitLiveApp/firebase-java-sdk")
-                 inceptionYear.set("2023")
-
-                 scm {
-                     url.set("https://github.com/GitLiveApp/firebase-java-sdk")
-                     connection.set("scm:git:https://github.com/GitLiveApp/firebase-java-sdk.git")
-                     developerConnection.set("scm:git:https://github.com/GitLiveApp/firebase-java-sdk.git")
-                     tag.set("HEAD")
-                 }
-
-                 issueManagement {
-                     system.set("GitHub Issues")
-                     url.set("https://github.com/GitLiveApp/firebase-java-sdk/issues")
-                 }
-
-                 developers {
-                     developer {
-                         name.set("Nicholas Bransby-Williams")
-                         email.set("nbransby@gmail.com")
-                     }
-                 }
-
-                 licenses {
-                     license {
-                         name.set("The Apache Software License, Version 2.0")
-                         url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                         distribution.set("repo")
-                         comments.set("A business-friendly OSS license")
-                     }
-                 }
+                description.set("The Firebase Java SDK is a pure java port of the Firebase Android SDK to run in clientside java environments such as the desktop.")
+                url.set("https://github.com/GitLiveApp/firebase-java-sdk")
+                inceptionYear.set("2023")
+
+                scm {
+                    url.set("https://github.com/GitLiveApp/firebase-java-sdk")
+                    connection.set("scm:git:https://github.com/GitLiveApp/firebase-java-sdk.git")
+                    developerConnection.set("scm:git:https://github.com/GitLiveApp/firebase-java-sdk.git")
+                    tag.set("HEAD")
+                }
+
+                issueManagement {
+                    system.set("GitHub Issues")
+                    url.set("https://github.com/GitLiveApp/firebase-java-sdk/issues")
+                }
+
+                developers {
+                    developer {
+                        name.set("Nicholas Bransby-Williams")
+                        email.set("nbransby@gmail.com")
+                    }
+                }
+
+                licenses {
+                    license {
+                        name.set("The Apache Software License, Version 2.0")
+                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                        distribution.set("repo")
+                        comments.set("A business-friendly OSS license")
+                    }
+                }
             }
         }
     }
- }
+}
 
 dependencies {
     compileOnly("org.robolectric:android-all:12.1-robolectric-8229987")
diff --git a/src/main/java/android/content/Context.kt b/src/main/java/android/content/Context.kt
@@ -58,7 +58,7 @@ open class Context {
             override fun getString(key: String, defaultValue: String?): String? {
                 return when {
                     key == "last-used-date" -> FirebasePlatform.firebasePlatform.retrieve(key) ?: defaultValue
-                    key.contains("|T|")  -> null
+                    key.contains("|T|") -> null
                     key.startsWith("com.google.firebase.auth.FIREBASE_USER") ->
                         FirebasePlatform.firebasePlatform.retrieve(key) ?: defaultValue
                     else -> throw IllegalArgumentException(key)
@@ -89,7 +89,7 @@ open class Context {
                     override fun putString(key: String?, value: String?): Editor {
                         when (key) {
                             "last-used-date" -> FirebasePlatform.firebasePlatform.store(key, value.toString())
-                            else -> if(key?.startsWith("com.google.firebase.auth.FIREBASE_USER") == true) {
+                            else -> if (key?.startsWith("com.google.firebase.auth.FIREBASE_USER") == true) {
                                 FirebasePlatform.firebasePlatform.store(key, value.toString())
                             } else {
                                 throw IllegalArgumentException(key)
diff --git a/src/main/java/android/net/Uri.kt b/src/main/java/android/net/Uri.kt
@@ -1,7 +1,7 @@
 package android.net
 
 import java.net.URI
-import java.util.*
+import java.util.Collections
 
 class Uri(private val uri: URI) {
 
@@ -47,8 +47,8 @@ class Uri(private val uri: URI) {
             if (separator > end || separator == -1) {
                 separator = end
             }
-            if (separator - start == key.length
-                && query.regionMatches(start, key, 0, key.length)
+            if (separator - start == key.length &&
+                query.regionMatches(start, key, 0, key.length)
             ) {
                 if (separator == end) {
                     return ""
@@ -64,4 +64,5 @@ class Uri(private val uri: URI) {
             }
         } while (true)
         return null
-    }}
+    }
+}
diff --git a/src/main/java/android/os/OperationCanceledException.kt b/src/main/java/android/os/OperationCanceledException.kt
@@ -1,3 +1,3 @@
 package android.os
 
-class OperationCanceledException : RuntimeException()
+class OperationCanceledException : RuntimeException()
diff --git a/src/main/java/com/google/firebase/auth/FirebaseAuth.kt b/src/main/java/com/google/firebase/auth/FirebaseAuth.kt
@@ -15,10 +15,29 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.json.*
-import okhttp3.*
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.longOrNull
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.Response
 import java.io.IOException
-import java.util.*
+import java.util.Base64
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
 
@@ -54,7 +73,7 @@ class FirebaseUserImpl private constructor(
             .orEmpty()
     }
 
-    val JsonElement.value get(): Any? = when(this) {
+    val JsonElement.value get(): Any? = when (this) {
         is JsonNull -> null
         is JsonArray -> map { it.value }
         is JsonObject -> jsonObject.mapValues { (_, it) -> it.value }
@@ -101,7 +120,6 @@ class FirebaseUserImpl private constructor(
     }
 
     override fun getIdToken(forceRefresh: Boolean) = FirebaseAuth.getInstance(app).getAccessToken(forceRefresh)
-
 }
 
 class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
@@ -129,7 +147,7 @@ class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
     val currentUser: FirebaseUser?
         get() = user
 
-    val FirebaseApp.key get() = "com.google.firebase.auth.FIREBASE_USER${"[${name}]".takeUnless { isDefaultApp }.orEmpty()}"
+    val FirebaseApp.key get() = "com.google.firebase.auth.FIREBASE_USER${"[$name]".takeUnless { isDefaultApp }.orEmpty()}"
 
     private var user: FirebaseUserImpl? = FirebasePlatform.firebasePlatform
         .runCatching { retrieve(app.key)?.let { FirebaseUserImpl(app, jsonParser.parseToJsonElement(it).jsonObject) } }
@@ -158,7 +176,7 @@ class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
                             Log.i("FirebaseAuth", "Calling onIdTokenChanged for ${value?.uid} on listener $listener")
                             listener.onIdTokenChanged(result)
                         }
-                        for(listener in idTokenListeners) {
+                        for (listener in idTokenListeners) {
                             listener.onIdTokenChanged(this@FirebaseAuth)
                         }
                     }
@@ -279,14 +297,14 @@ class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
     }
 
     fun signOut() {
-        //todo cancel token refresher
+        // todo cancel token refresher
         user = null
     }
 
     override fun getAccessToken(forceRefresh: Boolean): Task<GetTokenResult> {
         val user = user ?: return Tasks.forException(FirebaseNoSignedInUserException("Please sign in before trying to get a token."))
 
-        if (!forceRefresh && user.createdAt + user.expiresIn*1000 - 5*60*1000 > System.currentTimeMillis() ) {
+        if (!forceRefresh && user.createdAt + user.expiresIn * 1000 - 5 * 60 * 1000 > System.currentTimeMillis()) {
 //            Log.i("FirebaseAuth", "returning existing token for user ${user.uid} from getAccessToken")
             return Tasks.forResult(GetTokenResult(user.idToken, user.claims))
         }
diff --git a/src/main/java/org/sqlite/core/native.kt b/src/main/java/org/sqlite/core/native.kt
@@ -8,16 +8,16 @@ import org.sqlite.Function
 import org.sqlite.SQLiteConfig
 import org.sqlite.SQLiteOpenMode
 import java.text.Collator
-import java.util.*
+import java.util.Locale
 
 fun Open(path: String, openFlags: Int, label: String, enableTrace: Boolean, enableProfile: Boolean): NativeDB {
     NativeDB.load()
     val db = NativeDB(null, path, SQLiteConfig())
-    val flags = (0 .. 31).asSequence()
+    val flags = (0..31).asSequence()
         .map { 1 shl it }
         .filter { it and openFlags > 0 }
         .map {
-            when(it) {
+            when (it) {
                 SQLiteDatabase.CREATE_IF_NECESSARY -> SQLiteOpenMode.READWRITE.flag or SQLiteOpenMode.CREATE.flag
                 SQLiteDatabase.OPEN_READONLY -> {
                     db.config.isExplicitReadOnly = true
@@ -44,16 +44,18 @@ fun RegisterCustomFunction(
             args.indices.forEach { args[it] = value_text(it) }
 //            function.callback.callback(args)
         }
-
     }
     connectionPtr.create_function(function.name, callback, function.numArgs, 0)
 }
 
 fun RegisterLocalizedCollators(connectionPtr: NativeDB, locale: String) {
     val collator = Collator.getInstance(Locale.forLanguageTag(locale))
-    connectionPtr.create_collation(locale, object : Collation() {
-        override fun xCompare(str1: String?, str2: String?) = collator.compare(str1, str2)
-    })
+    connectionPtr.create_collation(
+        locale,
+        object : Collation() {
+            override fun xCompare(str1: String?, str2: String?) = collator.compare(str1, str2)
+        }
+    )
 }
 
 fun PrepareStatement(connectionPtr: NativeDB, sql: String) =
@@ -124,49 +126,49 @@ fun ExecuteForLastInsertedRowId(connectionPtr: NativeDB, statementPtr: Long): Lo
 fun ExecuteForCursorWindow(connectionPtr: NativeDB, statementPtr: Long, win: CursorWindow, startPos: Int, iRowRequired: Int, countAllRows: Boolean): Long {
 
     /* Set the number of columns in the window */
-    if(!win.setNumColumns(connectionPtr.column_count(statementPtr))) return 0
+    if (!win.setNumColumns(connectionPtr.column_count(statementPtr))) return 0
 
-    var nRow = 0;
-    var iStart = startPos;
-    var bOk = true;
+    var nRow = 0
+    var iStart = startPos
+    var bOk = true
 
-    while(connectionPtr.step(statementPtr) == Codes.SQLITE_ROW) {
+    while (connectionPtr.step(statementPtr) == Codes.SQLITE_ROW) {
         /* Only copy in rows that occur at or after row index iStart. */
-        if((nRow >= iStart) && bOk){
-            bOk = copyRowToWindow(connectionPtr, win, (nRow - iStart), statementPtr);
-            if(!bOk){
+        if ((nRow >= iStart) && bOk) {
+            bOk = copyRowToWindow(connectionPtr, win, (nRow - iStart), statementPtr)
+            if (!bOk) {
                 /* The CursorWindow object ran out of memory. If row iRowRequired was
                 ** not successfully added before this happened, clear the CursorWindow
                 ** and try to add the current row again.  */
-                if( nRow<=iRowRequired ){
-                    bOk = win.setNumColumns(connectionPtr.column_count(statementPtr));
-                    if(!bOk){
-                        connectionPtr.reset(statementPtr);
-                        return 0;
+                if (nRow <= iRowRequired) {
+                    bOk = win.setNumColumns(connectionPtr.column_count(statementPtr))
+                    if (!bOk) {
+                        connectionPtr.reset(statementPtr)
+                        return 0
                     }
-                    iStart = nRow;
-                    bOk = copyRowToWindow(connectionPtr, win, (nRow - iStart), statementPtr);
+                    iStart = nRow
+                    bOk = copyRowToWindow(connectionPtr, win, (nRow - iStart), statementPtr)
                 }
 
                 /* If the CursorWindow is still full and the countAllRows flag is not
                 ** set, break out of the loop here. If countAllRows is set, continue
                 ** so as to set variable nRow correctly.  */
-                if( !bOk && !countAllRows ) break;
+                if (!bOk && !countAllRows) break
             }
         }
 
-        nRow++;
+        nRow++
     }
 
     /* Finalize the statement. If this indicates an error occurred, throw an
     ** SQLiteException exception.  */
-    val rc = connectionPtr.reset(statementPtr);
-    if( rc!= Codes.SQLITE_OK ){
+    val rc = connectionPtr.reset(statementPtr)
+    if (rc != Codes.SQLITE_OK) {
         NativeDB.throwex(rc, connectionPtr.errmsg())
-        return 0;
+        return 0
     }
 
-    return iStart.toLong() shl 32 or nRow.toLong();
+    return iStart.toLong() shl 32 or nRow.toLong()
 }
 
 /*
@@ -176,13 +178,13 @@ fun ExecuteForCursorWindow(connectionPtr: NativeDB, statementPtr: Long, win: Cur
 ** occurs.
 */
 fun copyRowToWindow(connectionPtr: NativeDB, win: CursorWindow, iRow: Int, statementPtr: Long): Boolean {
-    val nCol = connectionPtr.column_count(statementPtr);
+    val nCol = connectionPtr.column_count(statementPtr)
     val i = 0
     var bOk = false
 
     bOk = win.allocRow()
-    for(i in 0 until nCol){
-        when(val type = connectionPtr.column_type(statementPtr, i)) {
+    for (i in 0 until nCol) {
+        when (val type = connectionPtr.column_type(statementPtr, i)) {
             Codes.SQLITE_NULL -> win.putNull(iRow, i)
             Codes.SQLITE_INTEGER -> win.putLong(connectionPtr.column_long(statementPtr, i), iRow, i)
             Codes.SQLITE_FLOAT -> win.putDouble(connectionPtr.column_double(statementPtr, i), iRow, i)
@@ -191,8 +193,8 @@ fun copyRowToWindow(connectionPtr: NativeDB, win: CursorWindow, iRow: Int, state
             else -> TODO("Unknown column type: $type")
         }
 
-        if(!bOk) win.freeLastRow()
+        if (!bOk) win.freeLastRow()
     }
 
-    return bOk;
+    return bOk
 }
diff --git a/src/test/kotlin/AppTest.kt b/src/test/kotlin/AppTest.kt
@@ -5,7 +5,6 @@ import com.google.firebase.FirebasePlatform
 import com.google.firebase.initialize
 import org.junit.Test
 
-
 class AppTest {
     @Test
     fun testInitialize() {
@@ -24,6 +23,5 @@ class AppTest {
             // setStorageBucket(...)
             .build()
         val app = Firebase.initialize(Application(), options)
-
     }
-}
+}
diff --git a/src/test/kotlin/FirestoreTest.kt b/src/test/kotlin/FirestoreTest.kt
@@ -11,7 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import java.io.File
 
-
 class FirestoreTest {
     @Before
     fun initialize() {
@@ -43,4 +42,4 @@ class FirestoreTest {
     }
 
     data class Data(val name: String = "none")
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package android.os`
`2`	`2`
`3`		`-class OperationCanceledException : RuntimeException()`
	`3`	`+class OperationCanceledException : RuntimeException()`