lint android
This commit is contained in:
+3
-1
@@ -4,7 +4,9 @@ import android.content.Context
|
|||||||
import com.google.firebase.messaging.RemoteMessage
|
import com.google.firebase.messaging.RemoteMessage
|
||||||
import expo.modules.blueskyswissarmy.sharedprefs.Preferences
|
import expo.modules.blueskyswissarmy.sharedprefs.Preferences
|
||||||
|
|
||||||
enum class NotificationType(val type: String) {
|
enum class NotificationType(
|
||||||
|
val type: String,
|
||||||
|
) {
|
||||||
Like("like"),
|
Like("like"),
|
||||||
Repost("repost"),
|
Repost("repost"),
|
||||||
Follow("follow"),
|
Follow("follow"),
|
||||||
|
|||||||
+32
-31
@@ -4,16 +4,17 @@ import expo.modules.blueskyswissarmy.sharedprefs.Preferences
|
|||||||
import expo.modules.kotlin.modules.Module
|
import expo.modules.kotlin.modules.Module
|
||||||
import expo.modules.kotlin.modules.ModuleDefinition
|
import expo.modules.kotlin.modules.ModuleDefinition
|
||||||
|
|
||||||
val DEFAULTS = mapOf<String, Any>(
|
val DEFAULTS =
|
||||||
"playSoundChat" to true,
|
mapOf<String, Any>(
|
||||||
"playSoundFollow" to false,
|
"playSoundChat" to true,
|
||||||
"playSoundLike" to false,
|
"playSoundFollow" to false,
|
||||||
"playSoundMention" to false,
|
"playSoundLike" to false,
|
||||||
"playSoundQuote" to false,
|
"playSoundMention" to false,
|
||||||
"playSoundReply" to false,
|
"playSoundQuote" to false,
|
||||||
"playSoundRepost" to false,
|
"playSoundReply" to false,
|
||||||
"mutedThreads" to mapOf<String, List<String>>()
|
"playSoundRepost" to false,
|
||||||
)
|
"mutedThreads" to mapOf<String, List<String>>(),
|
||||||
|
)
|
||||||
|
|
||||||
class ExpoBackgroundNotificationHandlerModule : Module() {
|
class ExpoBackgroundNotificationHandlerModule : Module() {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -24,15 +25,15 @@ class ExpoBackgroundNotificationHandlerModule : Module() {
|
|||||||
ModuleDefinition {
|
ModuleDefinition {
|
||||||
Name("ExpoBackgroundNotificationHandler")
|
Name("ExpoBackgroundNotificationHandler")
|
||||||
|
|
||||||
OnCreate {
|
OnCreate {
|
||||||
val context = appContext.reactContext ?: throw Error("Context is null")
|
val context = appContext.reactContext ?: throw Error("Context is null")
|
||||||
DEFAULTS.forEach { (key, value) ->
|
DEFAULTS.forEach { (key, value) ->
|
||||||
if (Preferences(context).hasValue(key)) {
|
if (Preferences(context).hasValue(key)) {
|
||||||
return@forEach
|
return@forEach
|
||||||
|
}
|
||||||
|
Preferences(context)._setAnyValue(key, value)
|
||||||
}
|
}
|
||||||
Preferences(context)._setAnyValue(key, value)
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
OnActivityEntersForeground {
|
OnActivityEntersForeground {
|
||||||
isForegrounded = true
|
isForegrounded = true
|
||||||
@@ -42,22 +43,22 @@ class ExpoBackgroundNotificationHandlerModule : Module() {
|
|||||||
isForegrounded = false
|
isForegrounded = false
|
||||||
}
|
}
|
||||||
|
|
||||||
AsyncFunction("getPrefsAsync") {
|
AsyncFunction("getPrefsAsync") {
|
||||||
val context = appContext.reactContext ?: throw Error("Context is null")
|
val context = appContext.reactContext ?: throw Error("Context is null")
|
||||||
val keys = DEFAULTS.keys
|
val keys = DEFAULTS.keys
|
||||||
return@AsyncFunction Preferences(context).getValues(keys)
|
return@AsyncFunction Preferences(context).getValues(keys)
|
||||||
}
|
}
|
||||||
|
|
||||||
AsyncFunction("resetGenericCountAsync") {
|
AsyncFunction("resetGenericCountAsync") {
|
||||||
// Not implemented
|
// Not implemented
|
||||||
}
|
}
|
||||||
|
|
||||||
AsyncFunction("maybeIncrementMessagesCountAsync") {
|
AsyncFunction("maybeIncrementMessagesCountAsync") {
|
||||||
// Not implemented
|
// Not implemented
|
||||||
}
|
}
|
||||||
|
|
||||||
AsyncFunction("maybeDecrementMessagesCountAsync") {
|
AsyncFunction("maybeDecrementMessagesCountAsync") {
|
||||||
// Not implemented
|
// Not implemented
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
-71
@@ -1,71 +0,0 @@
|
|||||||
package expo.modules.blueskyswissarmy.sharedprefs
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.util.Log
|
|
||||||
import expo.modules.kotlin.Promise
|
|
||||||
import expo.modules.kotlin.jni.JavaScriptValue
|
|
||||||
import expo.modules.kotlin.modules.Module
|
|
||||||
import expo.modules.kotlin.modules.ModuleDefinition
|
|
||||||
|
|
||||||
class ExpoBlueskySharedPrefsModule : Module() {
|
|
||||||
private fun getContext(): Context {
|
|
||||||
val context = appContext.reactContext ?: throw Error("Context is null")
|
|
||||||
return context
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun definition() = ModuleDefinition {
|
|
||||||
Name("ExpoBlueskySharedPrefs")
|
|
||||||
|
|
||||||
Function("setString") { key: String, value: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).setValue(key, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("setValue") { key: String, value: JavaScriptValue ->
|
|
||||||
val context = getContext()
|
|
||||||
Log.d("ExpoBlueskySharedPrefs", "Setting value for key: $key")
|
|
||||||
try {
|
|
||||||
if (value.isNumber()) {
|
|
||||||
SharedPrefs(context).setValue(key, value.getFloat())
|
|
||||||
} else if (value.isBool()) {
|
|
||||||
SharedPrefs(context).setValue(key, value.getBool())
|
|
||||||
} else if (value.isNull() || value.isUndefined()) {
|
|
||||||
SharedPrefs(context).removeValue(key)
|
|
||||||
} else {
|
|
||||||
Log.d(NAME, "Unsupported type: ${value.kind()}")
|
|
||||||
promise.reject("UNSUPPORTED_TYPE_ERROR", "Attempted to set an unsupported type", null)
|
|
||||||
}
|
|
||||||
} catch (e: Error) {
|
|
||||||
Log.d(NAME, "Error setting value: $e")
|
|
||||||
promise.reject("SET_VALUE_ERROR", "Error setting value", e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("removeValue") { key: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).removeValue(key)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("getString") { key: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).getString(key)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("getNumber") { key: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).getFloat(key)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("getBool") { key: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).getBoolean(key)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("addToSet") { key: String, value: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).addToSet(key, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("removeFromSet") { key: String, value: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).removeFromSet(key, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
Function("setContains") { key: String, value: String ->
|
|
||||||
return@Function SharedPrefs(getContext()).setContains(key, value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-193
@@ -1,193 +0,0 @@
|
|||||||
package expo.modules.blueskyswissarmy.sharedprefs
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.SharedPreferences
|
|
||||||
import android.util.Log
|
|
||||||
|
|
||||||
val DEFAULTS = mapOf<String, Any>(
|
|
||||||
"playSoundChat" to true,
|
|
||||||
"playSoundFollow" to false,
|
|
||||||
"playSoundLike" to false,
|
|
||||||
"playSoundMention" to false,
|
|
||||||
"playSoundQuote" to false,
|
|
||||||
"playSoundReply" to false,
|
|
||||||
"playSoundRepost" to false,
|
|
||||||
"badgeCount" to 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
const val NAME = "SharedPrefs"
|
|
||||||
|
|
||||||
class Preferences(private val context: Context) {
|
|
||||||
companion object {
|
|
||||||
private var hasInitialized = false
|
|
||||||
|
|
||||||
private var instance: SharedPreferences? = null
|
|
||||||
|
|
||||||
fun getInstance(context: Context, info: String? = "(no info)"): SharedPreferences {
|
|
||||||
if (instance == null) {
|
|
||||||
Log.d(NAME, "No preferences instance found, creating one.")
|
|
||||||
instance = context.getSharedPreferences("xyz.blueskyweb.app", Context.MODE_PRIVATE)
|
|
||||||
}
|
|
||||||
|
|
||||||
val safeInstance = instance ?: throw Error("Preferences is null: $info")
|
|
||||||
|
|
||||||
if (!hasInitialized) {
|
|
||||||
Log.d(NAME, "Preferences instance has not been initialized yet.")
|
|
||||||
initialize(safeInstance)
|
|
||||||
hasInitialized = true
|
|
||||||
Log.d(NAME, "Preferences instance has been initialized.")
|
|
||||||
}
|
|
||||||
|
|
||||||
return safeInstance
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun initialize(instance: SharedPreferences) {
|
|
||||||
instance
|
|
||||||
.edit()
|
|
||||||
.apply {
|
|
||||||
DEFAULTS.forEach { (key, value) ->
|
|
||||||
if (instance.contains(key)) {
|
|
||||||
return@forEach
|
|
||||||
}
|
|
||||||
|
|
||||||
when (value) {
|
|
||||||
is Boolean -> {
|
|
||||||
putBoolean(key, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
is String -> {
|
|
||||||
putString(key, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
is Array<*> -> {
|
|
||||||
putStringSet(key, value.map { it.toString() }.toSet())
|
|
||||||
}
|
|
||||||
|
|
||||||
is Map<*, *> -> {
|
|
||||||
putStringSet(key, value.map { it.toString() }.toSet())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.apply()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setValue(key: String, value: String) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
putString(key, value)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setValue(key: String, value: Float) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
putFloat(key, value)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setValue(key: String, value: Boolean) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
putBoolean(key, value)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setValue(key: String, value: Set<String>) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
putStringSet(key, value)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun removeValue(key: String) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
remove(key)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getString(key: String): String? {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
return safeInstance.getString(key, null)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getFloat(key: String): Float? {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
if (!safeInstance.contains(key)) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
return safeInstance.getFloat(key, 0.0f)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun _setAnyValue(key: String, value: Any) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
when (value) {
|
|
||||||
is String -> putString(key, value)
|
|
||||||
is Float -> putFloat(key, value)
|
|
||||||
is Boolean -> putBoolean(key, value)
|
|
||||||
is Set<*> -> putStringSet(key, value.map { it.toString() }.toSet())
|
|
||||||
else -> throw Error("Unsupported type: ${value::class.java}")
|
|
||||||
}
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getBoolean(key: String): Boolean? {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
if (!safeInstance.contains(key)) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
Log.d(NAME, "Getting boolean for key: $key")
|
|
||||||
val res = safeInstance.getBoolean(key, false)
|
|
||||||
Log.d(NAME, "Got boolean for key: $key, value: $res")
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addToSet(key: String, value: String) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
val set = safeInstance.getStringSet(key, setOf()) ?: setOf()
|
|
||||||
val newSet = set.toMutableSet().apply {
|
|
||||||
add(value)
|
|
||||||
}
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
putStringSet(key, newSet)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun removeFromSet(key: String, value: String) {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
val set = safeInstance.getStringSet(key, setOf()) ?: setOf()
|
|
||||||
val newSet = set.toMutableSet().apply {
|
|
||||||
remove(value)
|
|
||||||
}
|
|
||||||
safeInstance.edit().apply {
|
|
||||||
putStringSet(key, newSet)
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setContains(key: String, value: String): Boolean {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
val set = safeInstance.getStringSet(key, setOf()) ?: setOf()
|
|
||||||
return set.contains(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun hasValue(key: String): Boolean {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
return safeInstance.contains(key)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getValues(keys: Set<String>): Map<String, Any?> {
|
|
||||||
val safeInstance = getInstance(context)
|
|
||||||
return keys.associateWith { key ->
|
|
||||||
when (val value = safeInstance.all[key]) {
|
|
||||||
is String -> value
|
|
||||||
is Float -> value
|
|
||||||
is Boolean -> value
|
|
||||||
is Set<*> -> value
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user