From de25c4b676d5ffb1674bad59147d181831e24f5d Mon Sep 17 00:00:00 2001 From: Hailey Date: Wed, 10 Jul 2024 17:41:45 -0700 Subject: [PATCH] fix kotlin --- .editorconfig | 2 + .../BackgroundNotificationHandler.kt | 2 +- ...ExpoBackgroundNotificationHandlerModule.kt | 95 ++++++------ .../NotificationPrefs.kt | 107 +++++++------ .../AppCompatImageViewExtended.kt | 7 +- .../ExpoBlueskyGifViewModule.kt | 83 +++++----- .../expo/modules/blueskygifview/GifView.kt | 145 +++++++++--------- .../ExpoBlueskyDevicePrefsModule.kt | 7 +- .../referrer/ExpoBlueskyReferrerModule.kt | 83 +++++----- .../ExpoReceiveAndroidIntentsModule.kt | 36 +++-- 10 files changed, 297 insertions(+), 270 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..7ebd2b7bb0 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,2 @@ +[*.{kt,kts}] +indent_size=2 \ No newline at end of file diff --git a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/BackgroundNotificationHandler.kt b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/BackgroundNotificationHandler.kt index 0a8737b88f..7c1494c706 100644 --- a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/BackgroundNotificationHandler.kt +++ b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/BackgroundNotificationHandler.kt @@ -5,7 +5,7 @@ import com.google.firebase.messaging.RemoteMessage class BackgroundNotificationHandler( private val context: Context, - private val notifInterface: BackgroundNotificationHandlerInterface + private val notifInterface: BackgroundNotificationHandlerInterface, ) { fun handleMessage(remoteMessage: RemoteMessage) { if (ExpoBackgroundNotificationHandlerModule.isForegrounded) { diff --git a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/ExpoBackgroundNotificationHandlerModule.kt b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/ExpoBackgroundNotificationHandlerModule.kt index c876f899ac..0cc5fa6ab1 100644 --- a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/ExpoBackgroundNotificationHandlerModule.kt +++ b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/ExpoBackgroundNotificationHandlerModule.kt @@ -8,67 +8,68 @@ class ExpoBackgroundNotificationHandlerModule : Module() { var isForegrounded = false } - override fun definition() = ModuleDefinition { - Name("ExpoBackgroundNotificationHandler") + override fun definition() = + ModuleDefinition { + Name("ExpoBackgroundNotificationHandler") - OnCreate { - NotificationPrefs(appContext.reactContext).initialize() - } + OnCreate { + NotificationPrefs(appContext.reactContext).initialize() + } - OnActivityEntersForeground { - isForegrounded = true - } + OnActivityEntersForeground { + isForegrounded = true + } - OnActivityEntersBackground { - isForegrounded = false - } + OnActivityEntersBackground { + isForegrounded = false + } - AsyncFunction("getAllPrefsAsync") { - return@AsyncFunction NotificationPrefs(appContext.reactContext).getAllPrefs() - } + AsyncFunction("getAllPrefsAsync") { + return@AsyncFunction NotificationPrefs(appContext.reactContext).getAllPrefs() + } - AsyncFunction("getBoolAsync") { forKey: String -> - return@AsyncFunction NotificationPrefs(appContext.reactContext).getBoolean(forKey) - } + AsyncFunction("getBoolAsync") { forKey: String -> + return@AsyncFunction NotificationPrefs(appContext.reactContext).getBoolean(forKey) + } - AsyncFunction("getStringAsync") { forKey: String -> - return@AsyncFunction NotificationPrefs(appContext.reactContext).getString(forKey) - } + AsyncFunction("getStringAsync") { forKey: String -> + return@AsyncFunction NotificationPrefs(appContext.reactContext).getString(forKey) + } - AsyncFunction("getStringArrayAsync") { forKey: String -> - return@AsyncFunction NotificationPrefs(appContext.reactContext).getStringArray(forKey) - } + AsyncFunction("getStringArrayAsync") { forKey: String -> + return@AsyncFunction NotificationPrefs(appContext.reactContext).getStringArray(forKey) + } - AsyncFunction("setBoolAsync") { forKey: String, value: Boolean -> - NotificationPrefs(appContext.reactContext).setBoolean(forKey, value) - } + AsyncFunction("setBoolAsync") { forKey: String, value: Boolean -> + NotificationPrefs(appContext.reactContext).setBoolean(forKey, value) + } - AsyncFunction("setStringAsync") { forKey: String, value: String -> - NotificationPrefs(appContext.reactContext).setString(forKey, value) - } + AsyncFunction("setStringAsync") { forKey: String, value: String -> + NotificationPrefs(appContext.reactContext).setString(forKey, value) + } - AsyncFunction("setStringArrayAsync") { forKey: String, value: Array -> - NotificationPrefs(appContext.reactContext).setStringArray(forKey, value) - } + AsyncFunction("setStringArrayAsync") { forKey: String, value: Array -> + NotificationPrefs(appContext.reactContext).setStringArray(forKey, value) + } - AsyncFunction("addToStringArrayAsync") { forKey: String, string: String -> - NotificationPrefs(appContext.reactContext).addToStringArray(forKey, string) - } + AsyncFunction("addToStringArrayAsync") { forKey: String, string: String -> + NotificationPrefs(appContext.reactContext).addToStringArray(forKey, string) + } - AsyncFunction("removeFromStringArrayAsync") { forKey: String, string: String -> - NotificationPrefs(appContext.reactContext).removeFromStringArray(forKey, string) - } + AsyncFunction("removeFromStringArrayAsync") { forKey: String, string: String -> + NotificationPrefs(appContext.reactContext).removeFromStringArray(forKey, string) + } - AsyncFunction("addManyToStringArrayAsync") { forKey: String, strings: Array -> - NotificationPrefs(appContext.reactContext).addManyToStringArray(forKey, strings) - } + AsyncFunction("addManyToStringArrayAsync") { forKey: String, strings: Array -> + NotificationPrefs(appContext.reactContext).addManyToStringArray(forKey, strings) + } - AsyncFunction("removeManyFromStringArrayAsync") { forKey: String, strings: Array -> - NotificationPrefs(appContext.reactContext).removeManyFromStringArray(forKey, strings) - } + AsyncFunction("removeManyFromStringArrayAsync") { forKey: String, strings: Array -> + NotificationPrefs(appContext.reactContext).removeManyFromStringArray(forKey, strings) + } - AsyncFunction("setBadgeCountAsync") { _: Int -> - // This does nothing on Android + AsyncFunction("setBadgeCountAsync") { _: Int -> + // This does nothing on Android + } } - } } diff --git a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt index 17ef9205ef..97b05b4d73 100644 --- a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt +++ b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt @@ -2,20 +2,24 @@ package expo.modules.backgroundnotificationhandler import android.content.Context -val DEFAULTS = mapOf( - "playSoundChat" to true, - "playSoundFollow" to false, - "playSoundLike" to false, - "playSoundMention" to false, - "playSoundQuote" to false, - "playSoundReply" to false, - "playSoundRepost" to false, - "mutedThreads" to mapOf>() -) +val DEFAULTS = + mapOf( + "playSoundChat" to true, + "playSoundFollow" to false, + "playSoundLike" to false, + "playSoundMention" to false, + "playSoundQuote" to false, + "playSoundReply" to false, + "playSoundRepost" to false, + "mutedThreads" to mapOf>(), + ) -class NotificationPrefs (private val context: Context?) { - private val prefs = context?.getSharedPreferences("xyz.blueskyweb.app", Context.MODE_PRIVATE) - ?: throw Error("Context is null") +class NotificationPrefs( + private val context: Context?, +) { + private val prefs = + context?.getSharedPreferences("xyz.blueskyweb.app", Context.MODE_PRIVATE) + ?: throw Error("Context is null") fun initialize() { prefs @@ -41,94 +45,99 @@ class NotificationPrefs (private val context: Context?) { } } } - } - .apply() + }.apply() } - fun getAllPrefs(): MutableMap { - return prefs.all - } + fun getAllPrefs(): MutableMap = prefs.all - fun getBoolean(key: String): Boolean { - return prefs.getBoolean(key, false) - } + fun getBoolean(key: String): Boolean = prefs.getBoolean(key, false) - fun getString(key: String): String? { - return prefs.getString(key, null) - } + fun getString(key: String): String? = prefs.getString(key, null) - fun getStringArray(key: String): Array? { - return prefs.getStringSet(key, null)?.toTypedArray() - } + fun getStringArray(key: String): Array? = prefs.getStringSet(key, null)?.toTypedArray() - fun setBoolean(key: String, value: Boolean) { + fun setBoolean( + key: String, + value: Boolean, + ) { prefs .edit() .apply { putBoolean(key, value) - } - .apply() + }.apply() } - fun setString(key: String, value: String) { + fun setString( + key: String, + value: String, + ) { prefs .edit() .apply { putString(key, value) - } - .apply() + }.apply() } - fun setStringArray(key: String, value: Array) { + fun setStringArray( + key: String, + value: Array, + ) { prefs .edit() .apply { putStringSet(key, value.toSet()) - } - .apply() + }.apply() } - fun addToStringArray(key: String, string: String) { + fun addToStringArray( + key: String, + string: String, + ) { prefs .edit() .apply { val set = prefs.getStringSet(key, null)?.toMutableSet() ?: mutableSetOf() set.add(string) putStringSet(key, set) - } - .apply() + }.apply() } - fun removeFromStringArray(key: String, string: String) { + fun removeFromStringArray( + key: String, + string: String, + ) { prefs .edit() .apply { val set = prefs.getStringSet(key, null)?.toMutableSet() ?: mutableSetOf() set.remove(string) putStringSet(key, set) - } - .apply() + }.apply() } - fun addManyToStringArray(key: String, strings: Array) { + fun addManyToStringArray( + key: String, + strings: Array, + ) { prefs .edit() .apply { val set = prefs.getStringSet(key, null)?.toMutableSet() ?: mutableSetOf() set.addAll(strings.toSet()) putStringSet(key, set) - } - .apply() + }.apply() } - fun removeManyFromStringArray(key: String, strings: Array) { + fun removeManyFromStringArray( + key: String, + strings: Array, + ) { prefs .edit() .apply { val set = prefs.getStringSet(key, null)?.toMutableSet() ?: mutableSetOf() set.removeAll(strings.toSet()) putStringSet(key, set) - } - .apply() + }.apply() } -} \ No newline at end of file +} diff --git a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/AppCompatImageViewExtended.kt b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/AppCompatImageViewExtended.kt index 5d20848453..5ba5ccf71a 100644 --- a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/AppCompatImageViewExtended.kt +++ b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/AppCompatImageViewExtended.kt @@ -5,7 +5,10 @@ import android.graphics.Canvas import android.graphics.drawable.Animatable import androidx.appcompat.widget.AppCompatImageView -class AppCompatImageViewExtended(context: Context, private val parent: GifView): AppCompatImageView(context) { +class AppCompatImageViewExtended( + context: Context, + private val parent: GifView, +) : AppCompatImageView(context) { override fun onDraw(canvas: Canvas) { super.onDraw(canvas) @@ -34,4 +37,4 @@ class AppCompatImageViewExtended(context: Context, private val parent: GifView): drawable.start() } } -} \ No newline at end of file +} diff --git a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/ExpoBlueskyGifViewModule.kt b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/ExpoBlueskyGifViewModule.kt index 625e1d45f9..b0b3e8eeb7 100644 --- a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/ExpoBlueskyGifViewModule.kt +++ b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/ExpoBlueskyGifViewModule.kt @@ -6,49 +6,50 @@ import expo.modules.kotlin.modules.Module import expo.modules.kotlin.modules.ModuleDefinition class ExpoBlueskyGifViewModule : Module() { - override fun definition() = ModuleDefinition { - Name("ExpoBlueskyGifView") + override fun definition() = + ModuleDefinition { + Name("ExpoBlueskyGifView") - AsyncFunction("prefetchAsync") { sources: List -> - val activity = appContext.currentActivity ?: return@AsyncFunction - val glide = Glide.with(activity) + AsyncFunction("prefetchAsync") { sources: List -> + val activity = appContext.currentActivity ?: return@AsyncFunction + val glide = Glide.with(activity) - sources.forEach { source -> - glide - .download(source) - .diskCacheStrategy(DiskCacheStrategy.DATA) - .submit() + sources.forEach { source -> + glide + .download(source) + .diskCacheStrategy(DiskCacheStrategy.DATA) + .submit() + } + } + + View(GifView::class) { + Events( + "onPlayerStateChange", + ) + + Prop("source") { view: GifView, source: String -> + view.source = source + } + + Prop("placeholderSource") { view: GifView, source: String -> + view.placeholderSource = source + } + + Prop("autoplay") { view: GifView, autoplay: Boolean -> + view.autoplay = autoplay + } + + AsyncFunction("playAsync") { view: GifView -> + view.play() + } + + AsyncFunction("pauseAsync") { view: GifView -> + view.pause() + } + + AsyncFunction("toggleAsync") { view: GifView -> + view.toggle() + } } } - - View(GifView::class) { - Events( - "onPlayerStateChange" - ) - - Prop("source") { view: GifView, source: String -> - view.source = source - } - - Prop("placeholderSource") { view: GifView, source: String -> - view.placeholderSource = source - } - - Prop("autoplay") { view: GifView, autoplay: Boolean -> - view.autoplay = autoplay - } - - AsyncFunction("playAsync") { view: GifView -> - view.play() - } - - AsyncFunction("pauseAsync") { view: GifView -> - view.pause() - } - - AsyncFunction("toggleAsync") { view: GifView -> - view.toggle() - } - } - } } diff --git a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt index be5830df7a..5e467a1603 100644 --- a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt +++ b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt @@ -1,6 +1,5 @@ package expo.modules.blueskygifview - import android.content.Context import android.graphics.Color import android.graphics.drawable.Animatable @@ -15,7 +14,10 @@ import expo.modules.kotlin.exception.Exceptions import expo.modules.kotlin.viewevent.EventDispatcher import expo.modules.kotlin.views.ExpoView -class GifView(context: Context, appContext: AppContext) : ExpoView(context, appContext) { +class GifView( + context: Context, + appContext: AppContext, +) : ExpoView(context, appContext) { // Events private val onPlayerStateChange by EventDispatcher() @@ -44,8 +46,7 @@ class GifView(context: Context, appContext: AppContext) : ExpoView(context, appC } } - - // + // init { this.setBackgroundColor(Color.TRANSPARENT) @@ -70,80 +71,82 @@ class GifView(context: Context, appContext: AppContext) : ExpoView(context, appC super.onDetachedFromWindow() } - // + // - // + // private fun load() { if (placeholderSource == null || source == null) { return } - this.webpRequest = glide.load(source) - .diskCacheStrategy(DiskCacheStrategy.DATA) - .skipMemoryCache(false) - .listener(object: RequestListener { - override fun onResourceReady( - resource: Drawable?, - model: Any?, - target: Target?, - dataSource: com.bumptech.glide.load.DataSource?, - isFirstResource: Boolean - ): Boolean { - if (placeholderRequest != null) { - glide.clear(placeholderRequest) - } - return false - } + this.webpRequest = + glide + .load(source) + .diskCacheStrategy(DiskCacheStrategy.DATA) + .skipMemoryCache(false) + .listener( + object : RequestListener { + override fun onResourceReady( + resource: Drawable?, + model: Any?, + target: Target?, + dataSource: com.bumptech.glide.load.DataSource?, + isFirstResource: Boolean, + ): Boolean { + if (placeholderRequest != null) { + glide.clear(placeholderRequest) + } + return false + } - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target?, - isFirstResource: Boolean - ): Boolean { - return true - } - }) - .into(this.imageView) + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target?, + isFirstResource: Boolean, + ): Boolean = true + }, + ).into(this.imageView) if (this.imageView.drawable == null || this.imageView.drawable !is Animatable) { - this.placeholderRequest = glide.load(placeholderSource) - .diskCacheStrategy(DiskCacheStrategy.DATA) - // Let's not bloat the memory cache with placeholders - .skipMemoryCache(true) - .listener(object: RequestListener { - override fun onResourceReady( - resource: Drawable?, - model: Any?, - target: Target?, - dataSource: com.bumptech.glide.load.DataSource?, - isFirstResource: Boolean - ): Boolean { - // Incase this request finishes after the webp, let's just not set - // the drawable. This shouldn't happen because the request should get cancelled - if (imageView.drawable == null) { - imageView.setImageDrawable(resource) - } - return true - } + this.placeholderRequest = + glide + .load(placeholderSource) + .diskCacheStrategy(DiskCacheStrategy.DATA) + // Let's not bloat the memory cache with placeholders + .skipMemoryCache(true) + .listener( + object : RequestListener { + override fun onResourceReady( + resource: Drawable?, + model: Any?, + target: Target?, + dataSource: com.bumptech.glide.load.DataSource?, + isFirstResource: Boolean, + ): Boolean { + // Incase this request finishes after the webp, let's just not set + // the drawable. This shouldn't happen because the request should get cancelled + if (imageView.drawable == null) { + imageView.setImageDrawable(resource) + } + return true + } - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target?, - isFirstResource: Boolean - ): Boolean { - return true - } - }) - .submit() + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target?, + isFirstResource: Boolean, + ): Boolean = true + }, + ).submit() } } - // + // - // + // fun play() { this.imageView.play() @@ -165,16 +168,18 @@ class GifView(context: Context, appContext: AppContext) : ExpoView(context, appC } } - // + // - // + // fun firePlayerStateChange() { - onPlayerStateChange(mapOf( - "isPlaying" to this.isPlaying, - "isLoaded" to this.isLoaded, - )) + onPlayerStateChange( + mapOf( + "isPlaying" to this.isPlaying, + "isLoaded" to this.isLoaded, + ), + ) } - // + // } diff --git a/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/deviceprefs/ExpoBlueskyDevicePrefsModule.kt b/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/deviceprefs/ExpoBlueskyDevicePrefsModule.kt index 29017f17aa..51f9fe45de 100644 --- a/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/deviceprefs/ExpoBlueskyDevicePrefsModule.kt +++ b/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/deviceprefs/ExpoBlueskyDevicePrefsModule.kt @@ -4,7 +4,8 @@ import expo.modules.kotlin.modules.Module import expo.modules.kotlin.modules.ModuleDefinition class ExpoBlueskyDevicePrefsModule : Module() { - override fun definition() = ModuleDefinition { - Name("ExpoBlueskyDevicePrefs") - } + override fun definition() = + ModuleDefinition { + Name("ExpoBlueskyDevicePrefs") + } } diff --git a/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/referrer/ExpoBlueskyReferrerModule.kt b/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/referrer/ExpoBlueskyReferrerModule.kt index 3589b364e0..ac6ed90b84 100644 --- a/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/referrer/ExpoBlueskyReferrerModule.kt +++ b/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/referrer/ExpoBlueskyReferrerModule.kt @@ -3,52 +3,55 @@ package expo.modules.blueskyswissarmy.referrer import android.util.Log import com.android.installreferrer.api.InstallReferrerClient import com.android.installreferrer.api.InstallReferrerStateListener +import expo.modules.kotlin.Promise import expo.modules.kotlin.modules.Module import expo.modules.kotlin.modules.ModuleDefinition -import expo.modules.kotlin.Promise class ExpoBlueskyReferrerModule : Module() { - override fun definition() = ModuleDefinition { - Name("ExpoBlueskyReferrer") + override fun definition() = + ModuleDefinition { + Name("ExpoBlueskyReferrer") - AsyncFunction("getGooglePlayReferrerInfoAsync") { promise: Promise -> - val referrerClient = InstallReferrerClient.newBuilder(appContext.reactContext).build() - referrerClient.startConnection(object : InstallReferrerStateListener { - override fun onInstallReferrerSetupFinished(responseCode: Int) { - if (responseCode == InstallReferrerClient.InstallReferrerResponse.OK) { - Log.d("ExpoGooglePlayReferrer", "Successfully retrieved referrer info.") + AsyncFunction("getGooglePlayReferrerInfoAsync") { promise: Promise -> + val referrerClient = InstallReferrerClient.newBuilder(appContext.reactContext).build() + referrerClient.startConnection( + object : InstallReferrerStateListener { + override fun onInstallReferrerSetupFinished(responseCode: Int) { + if (responseCode == InstallReferrerClient.InstallReferrerResponse.OK) { + Log.d("ExpoGooglePlayReferrer", "Successfully retrieved referrer info.") - val response = referrerClient.installReferrer - Log.d("ExpoGooglePlayReferrer", "Install referrer: ${response.installReferrer}") + val response = referrerClient.installReferrer + Log.d("ExpoGooglePlayReferrer", "Install referrer: ${response.installReferrer}") - promise.resolve( - mapOf( - "installReferrer" to response.installReferrer, - "clickTimestamp" to response.referrerClickTimestampSeconds, - "installTimestamp" to response.installBeginTimestampSeconds + promise.resolve( + mapOf( + "installReferrer" to response.installReferrer, + "clickTimestamp" to response.referrerClickTimestampSeconds, + "installTimestamp" to response.installBeginTimestampSeconds, + ), + ) + } else { + Log.d("ExpoGooglePlayReferrer", "Failed to get referrer info. Unknown error.") + promise.reject( + "ERR_GOOGLE_PLAY_REFERRER_UNKNOWN", + "Failed to get referrer info", + Exception("Failed to get referrer info"), + ) + } + referrerClient.endConnection() + } + + override fun onInstallReferrerServiceDisconnected() { + Log.d("ExpoGooglePlayReferrer", "Failed to get referrer info. Service disconnected.") + referrerClient.endConnection() + promise.reject( + "ERR_GOOGLE_PLAY_REFERRER_DISCONNECTED", + "Failed to get referrer info", + Exception("Failed to get referrer info"), ) - ) - } else { - Log.d("ExpoGooglePlayReferrer", "Failed to get referrer info. Unknown error.") - promise.reject( - "ERR_GOOGLE_PLAY_REFERRER_UNKNOWN", - "Failed to get referrer info", - Exception("Failed to get referrer info") - ) - } - referrerClient.endConnection() - } - - override fun onInstallReferrerServiceDisconnected() { - Log.d("ExpoGooglePlayReferrer", "Failed to get referrer info. Service disconnected.") - referrerClient.endConnection() - promise.reject( - "ERR_GOOGLE_PLAY_REFERRER_DISCONNECTED", - "Failed to get referrer info", - Exception("Failed to get referrer info") - ) - } - }) + } + }, + ) + } } - } -} \ No newline at end of file +} diff --git a/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt b/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt index c2e17fb80a..7ecea16314 100644 --- a/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt +++ b/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt @@ -13,16 +13,17 @@ import java.io.FileOutputStream import java.net.URLEncoder class ExpoReceiveAndroidIntentsModule : Module() { - override fun definition() = ModuleDefinition { - Name("ExpoReceiveAndroidIntents") + override fun definition() = + ModuleDefinition { + Name("ExpoReceiveAndroidIntents") - OnNewIntent { - handleIntent(it) + OnNewIntent { + handleIntent(it) + } } - } private fun handleIntent(intent: Intent?) { - if(appContext.currentActivity == null || intent == null) return + if (appContext.currentActivity == null || intent == null) return if (intent.action == Intent.ACTION_SEND) { if (intent.type == "text/plain") { @@ -40,7 +41,7 @@ class ExpoReceiveAndroidIntentsModule : Module() { private fun handleTextIntent(intent: Intent) { intent.getStringExtra(Intent.EXTRA_TEXT)?.let { val encoded = URLEncoder.encode(it, "UTF-8") - "bluesky://intent/compose?text=${encoded}".toUri().let { uri -> + "bluesky://intent/compose?text=$encoded".toUri().let { uri -> val newIntent = Intent(Intent.ACTION_VIEW, uri) appContext.currentActivity?.startActivity(newIntent) } @@ -48,11 +49,12 @@ class ExpoReceiveAndroidIntentsModule : Module() { } private fun handleImageIntent(intent: Intent) { - val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java) - } else { - intent.getParcelableExtra(Intent.EXTRA_STREAM) - } + val uri = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java) + } else { + intent.getParcelableExtra(Intent.EXTRA_STREAM) + } if (uri == null) return handleImageIntents(listOf(uri)) @@ -76,16 +78,16 @@ class ExpoReceiveAndroidIntentsModule : Module() { uris.forEachIndexed { index, uri -> val info = getImageInfo(uri) val params = buildUriData(info) - allParams = "${allParams}${params}" + allParams = "${allParams}$params" if (index < uris.count() - 1) { - allParams = "${allParams}," + allParams = "$allParams," } } val encoded = URLEncoder.encode(allParams, "UTF-8") - "bluesky://intent/compose?imageUris=${encoded}".toUri().let { + "bluesky://intent/compose?imageUris=$encoded".toUri().let { val newIntent = Intent(Intent.ACTION_VIEW, it) appContext.currentActivity?.startActivity(newIntent) } @@ -104,7 +106,7 @@ class ExpoReceiveAndroidIntentsModule : Module() { return mapOf( "width" to bitmap.width, "height" to bitmap.height, - "path" to file.path.toString() + "path" to file.path.toString(), ) } @@ -114,6 +116,6 @@ class ExpoReceiveAndroidIntentsModule : Module() { val path = info.getValue("path") val width = info.getValue("width") val height = info.getValue("height") - return "file://${path}|${width}|${height}" + return "file://$path|$width|$height" } }