Skip to content

Fix ktlint errors #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Fix ktlint errors #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("[email protected]")
}
}

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("[email protected]")
}
}

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")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/android/content/Context.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/android/net/Uri.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package android.net

import java.net.URI
import java.util.*
import java.util.Collections

class Uri(private val uri: URI) {

Expand Down Expand Up @@ -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 ""
Expand All @@ -64,4 +64,5 @@ class Uri(private val uri: URI) {
}
} while (true)
return null
}}
}
}
2 changes: 1 addition & 1 deletion src/main/java/android/os/OperationCanceledException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package android.os

class OperationCanceledException : RuntimeException()
class OperationCanceledException : RuntimeException()
76 changes: 51 additions & 25 deletions src/main/java/com/google/firebase/auth/FirebaseAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 }
Expand All @@ -79,10 +98,12 @@ class FirebaseUserImpl private constructor(
override fun onResponse(call: Call, response: Response) {
if (!response.isSuccessful) {
FirebaseAuth.getInstance(app).signOut()
source.setException(FirebaseAuthInvalidUserException(
response.message(),
FirebaseAuth.getInstance(app).formatErrorMessage("deleteAccount", request, response)
))
source.setException(
FirebaseAuthInvalidUserException(
response.message(),
FirebaseAuth.getInstance(app).formatErrorMessage("deleteAccount", request, response)
)
)
} else {
source.setResult(null)
}
Expand All @@ -98,7 +119,6 @@ class FirebaseUserImpl private constructor(
}

override fun getIdToken(forceRefresh: Boolean) = FirebaseAuth.getInstance(app).getAccessToken(forceRefresh)

}

class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
Expand Down Expand Up @@ -126,7 +146,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) } }
Expand Down Expand Up @@ -155,7 +175,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)
}
}
Expand All @@ -179,10 +199,12 @@ class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
@Throws(IOException::class)
override fun onResponse(call: Call, response: Response) {
if (!response.isSuccessful) {
source.setException(FirebaseAuthInvalidUserException(
response.message(),
formatErrorMessage("accounts:signUp", request, response)
))
source.setException(
FirebaseAuthInvalidUserException(
response.message(),
formatErrorMessage("accounts:signUp", request, response)
)
)
} else {
val body = response.body()!!.use { it.string() }
user = FirebaseUserImpl(app, jsonParser.parseToJsonElement(body).jsonObject, true)
Expand Down Expand Up @@ -212,10 +234,12 @@ class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
@Throws(IOException::class)
override fun onResponse(call: Call, response: Response) {
if (!response.isSuccessful) {
source.setException(FirebaseAuthInvalidUserException(
response.message(),
formatErrorMessage("verifyCustomToken", request, response)
))
source.setException(
FirebaseAuthInvalidUserException(
response.message(),
formatErrorMessage("verifyCustomToken", request, response)
)
)
} else {
val body = response.body()!!.use { it.string() }
val user = FirebaseUserImpl(app, jsonParser.parseToJsonElement(body).jsonObject)
Expand Down Expand Up @@ -245,10 +269,12 @@ class FirebaseAuth constructor(val app: FirebaseApp) : InternalAuthProvider {
@Throws(IOException::class)
override fun onResponse(call: Call, response: Response) {
if (!response.isSuccessful) {
source.setException(FirebaseAuthInvalidUserException(
response.message(),
formatErrorMessage("verifyPassword", request, response)
))
source.setException(
FirebaseAuthInvalidUserException(
response.message(),
formatErrorMessage("verifyPassword", request, response)
)
)
} else {
val body = response.body()!!.use { it.string() }
val user = FirebaseUserImpl(app, jsonParser.parseToJsonElement(body).jsonObject)
Expand All @@ -266,14 +292,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))
}
Expand Down
Loading