Reverts to the non-Google kotlin style.

2024-01-06 11:32:41 -05:00
parent 0be1f89368
commit f8e7dd78d9
415 changed files with 64333 additions and 64218 deletions
@@ -21,5 +21,5 @@
 package com.vitorpamplona.amethyst.service.lang

 object LanguageTranslatorService {
-  fun clear() {}
+    fun clear() {}
 }
@@ -28,80 +28,80 @@ import com.vitorpamplona.amethyst.Amethyst
 import org.unifiedpush.android.connector.UnifiedPush

 interface PushDistributorActions {
-  fun getSavedDistributor(): String
+    fun getSavedDistributor(): String

-  fun getInstalledDistributors(): List<String>
+    fun getInstalledDistributors(): List<String>

-  fun saveDistributor(distributor: String)
+    fun saveDistributor(distributor: String)

-  fun removeSavedDistributor()
+    fun removeSavedDistributor()
 }

 object PushDistributorHandler : PushDistributorActions {
-  private val appContext = Amethyst.instance.applicationContext
-  private val unifiedPush: UnifiedPush = UnifiedPush
+    private val appContext = Amethyst.instance.applicationContext
+    private val unifiedPush: UnifiedPush = UnifiedPush

-  private var endpointInternal = ""
-  val endpoint = endpointInternal
+    private var endpointInternal = ""
+    val endpoint = endpointInternal

-  fun getSavedEndpoint() = endpoint
+    fun getSavedEndpoint() = endpoint

-  fun setEndpoint(newEndpoint: String) {
-    endpointInternal = newEndpoint
-    Log.d("PushHandler", "New endpoint saved : $endpointInternal")
-  }
+    fun setEndpoint(newEndpoint: String) {
+        endpointInternal = newEndpoint
+        Log.d("PushHandler", "New endpoint saved : $endpointInternal")
+    }

-  fun removeEndpoint() {
-    endpointInternal = ""
-  }
+    fun removeEndpoint() {
+        endpointInternal = ""
+    }

-  override fun getSavedDistributor(): String {
-    return unifiedPush.getDistributor(appContext)
-  }
+    override fun getSavedDistributor(): String {
+        return unifiedPush.getDistributor(appContext)
+    }

-  fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()
+    fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()

-  override fun getInstalledDistributors(): List<String> {
-    return unifiedPush.getDistributors(appContext)
-  }
+    override fun getInstalledDistributors(): List<String> {
+        return unifiedPush.getDistributors(appContext)
+    }

-  fun formattedDistributorNames(): List<String> {
-    val distributorsArray = getInstalledDistributors().toTypedArray()
-    val distributorsNameArray =
-      distributorsArray
-        .map {
-          try {
-            val ai =
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                appContext.packageManager.getApplicationInfo(
-                  it,
-                  PackageManager.ApplicationInfoFlags.of(
-                    PackageManager.GET_META_DATA.toLong(),
-                  ),
-                )
-              } else {
-                appContext.packageManager.getApplicationInfo(it, 0)
-              }
-            appContext.packageManager.getApplicationLabel(ai)
-          } catch (e: PackageManager.NameNotFoundException) {
-            it
-          }
-            as String
-        }
-        .toTypedArray()
-    return distributorsNameArray.toList()
-  }
+    fun formattedDistributorNames(): List<String> {
+        val distributorsArray = getInstalledDistributors().toTypedArray()
+        val distributorsNameArray =
+            distributorsArray
+                .map {
+                    try {
+                        val ai =
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                                appContext.packageManager.getApplicationInfo(
+                                    it,
+                                    PackageManager.ApplicationInfoFlags.of(
+                                        PackageManager.GET_META_DATA.toLong(),
+                                    ),
+                                )
+                            } else {
+                                appContext.packageManager.getApplicationInfo(it, 0)
+                            }
+                        appContext.packageManager.getApplicationLabel(ai)
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        it
+                    }
+                        as String
+                }
+                .toTypedArray()
+        return distributorsNameArray.toList()
+    }

-  override fun saveDistributor(distributor: String) {
-    unifiedPush.saveDistributor(appContext, distributor)
-    unifiedPush.registerApp(appContext)
-  }
+    override fun saveDistributor(distributor: String) {
+        unifiedPush.saveDistributor(appContext, distributor)
+        unifiedPush.registerApp(appContext)
+    }

-  override fun removeSavedDistributor() {
-    unifiedPush.safeRemoveDistributor(appContext)
-  }
+    override fun removeSavedDistributor() {
+        unifiedPush.safeRemoveDistributor(appContext)
+    }

-  fun forceRemoveDistributor(context: Context) {
-    unifiedPush.forceRemoveDistributor(context)
-  }
+    fun forceRemoveDistributor(context: Context) {
+        unifiedPush.forceRemoveDistributor(context)
+    }
 }
@@ -40,92 +40,92 @@ import kotlinx.coroutines.launch
 import org.unifiedpush.android.connector.MessagingReceiver

 class PushMessageReceiver : MessagingReceiver() {
-  companion object {
-    private val TAG = "Amethyst-OSSPushReceiver"
-  }
-
-  private val appContext = Amethyst.instance.applicationContext
-  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-  private val eventCache = LruCache<String, String>(100)
-  private val pushHandler = PushDistributorHandler
-
-  override fun onMessage(
-    context: Context,
-    message: ByteArray,
-    instance: String,
-  ) {
-    val messageStr = String(message)
-    Log.d(TAG, "New message ${message.decodeToString()} for Instance: $instance")
-    scope.launch {
-      try {
-        parseMessage(messageStr)?.let { receiveIfNew(it) }
-      } catch (e: Exception) {
-        Log.d(TAG, "Message could not be parsed: ${e.message}")
-      }
+    companion object {
+        private val TAG = "Amethyst-OSSPushReceiver"
    }
-  }

-  private suspend fun parseMessage(message: String): GiftWrapEvent? {
-    (Event.fromJson(message) as? GiftWrapEvent)?.let {
-      return it
+    private val appContext = Amethyst.instance.applicationContext
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val eventCache = LruCache<String, String>(100)
+    private val pushHandler = PushDistributorHandler
+
+    override fun onMessage(
+        context: Context,
+        message: ByteArray,
+        instance: String,
+    ) {
+        val messageStr = String(message)
+        Log.d(TAG, "New message ${message.decodeToString()} for Instance: $instance")
+        scope.launch {
+            try {
+                parseMessage(messageStr)?.let { receiveIfNew(it) }
+            } catch (e: Exception) {
+                Log.d(TAG, "Message could not be parsed: ${e.message}")
+            }
+        }
    }
-    return null
-  }

-  private suspend fun receiveIfNew(event: GiftWrapEvent) {
-    if (eventCache.get(event.id) == null) {
-      eventCache.put(event.id, event.id)
-      EventNotificationConsumer(appContext).consume(event)
+    private suspend fun parseMessage(message: String): GiftWrapEvent? {
+        (Event.fromJson(message) as? GiftWrapEvent)?.let {
+            return it
+        }
+        return null
    }
-  }

-  override fun onNewEndpoint(
-    context: Context,
-    endpoint: String,
-    instance: String,
-  ) {
-    Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
-    val sanitizedEndpoint = endpoint.dropLast(5)
-    pushHandler.setEndpoint(sanitizedEndpoint)
-    scope.launch(Dispatchers.IO) {
-      RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
-      notificationManager().getOrCreateZapChannel(appContext)
-      notificationManager().getOrCreateDMChannel(appContext)
+    private suspend fun receiveIfNew(event: GiftWrapEvent) {
+        if (eventCache.get(event.id) == null) {
+            eventCache.put(event.id, event.id)
+            EventNotificationConsumer(appContext).consume(event)
+        }
    }
-  }

-  override fun onReceive(
-    context: Context,
-    intent: Intent,
-  ) {
-    val intentData = intent.dataString
-    val intentAction = intent.action.toString()
-    Log.d(TAG, "Intent Data:- $intentData Intent Action: $intentAction")
-    super.onReceive(context, intent)
-  }
+    override fun onNewEndpoint(
+        context: Context,
+        endpoint: String,
+        instance: String,
+    ) {
+        Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
+        val sanitizedEndpoint = endpoint.dropLast(5)
+        pushHandler.setEndpoint(sanitizedEndpoint)
+        scope.launch(Dispatchers.IO) {
+            RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
+            notificationManager().getOrCreateZapChannel(appContext)
+            notificationManager().getOrCreateDMChannel(appContext)
+        }
+    }

-  override fun onRegistrationFailed(
-    context: Context,
-    instance: String,
-  ) {
-    Log.d(TAG, "Registration failed for Instance: $instance")
-    scope.cancel()
-    pushHandler.forceRemoveDistributor(context)
-  }
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        val intentData = intent.dataString
+        val intentAction = intent.action.toString()
+        Log.d(TAG, "Intent Data:- $intentData Intent Action: $intentAction")
+        super.onReceive(context, intent)
+    }

-  override fun onUnregistered(
-    context: Context,
-    instance: String,
-  ) {
-    val removedEndpoint = pushHandler.endpoint
-    Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
-    Log.d(TAG, "App is unregistered. ")
-    pushHandler.forceRemoveDistributor(context)
-    pushHandler.removeEndpoint()
-  }
+    override fun onRegistrationFailed(
+        context: Context,
+        instance: String,
+    ) {
+        Log.d(TAG, "Registration failed for Instance: $instance")
+        scope.cancel()
+        pushHandler.forceRemoveDistributor(context)
+    }

-  fun notificationManager(): NotificationManager {
-    return ContextCompat.getSystemService(appContext, NotificationManager::class.java)
-      as NotificationManager
-  }
+    override fun onUnregistered(
+        context: Context,
+        instance: String,
+    ) {
+        val removedEndpoint = pushHandler.endpoint
+        Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
+        Log.d(TAG, "App is unregistered. ")
+        pushHandler.forceRemoveDistributor(context)
+        pushHandler.removeEndpoint()
+    }
+
+    fun notificationManager(): NotificationManager {
+        return ContextCompat.getSystemService(appContext, NotificationManager::class.java)
+            as NotificationManager
+    }
 }
@@ -24,19 +24,19 @@ import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo

 object PushNotificationUtils {
-  var hasInit: Boolean = false
-  private val pushHandler = PushDistributorHandler
+    var hasInit: Boolean = false
+    private val pushHandler = PushDistributorHandler

-  suspend fun init(accounts: List<AccountInfo>) {
-    if (hasInit || pushHandler.savedDistributorExists()) {
-      return
+    suspend fun init(accounts: List<AccountInfo>) {
+        if (hasInit || pushHandler.savedDistributorExists()) {
+            return
+        }
+        try {
+            if (pushHandler.savedDistributorExists()) {
+                RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
+            }
+        } catch (e: Exception) {
+            Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
+        }
    }
-    try {
-      if (pushHandler.savedDistributorExists()) {
-        RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
-      }
-    } catch (e: Exception) {
-      Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
-    }
-  }
 }
@@ -64,143 +64,142 @@ import kotlinx.collections.immutable.toImmutableList
@OptIn(ExperimentalPermissionsApi::class)
@Composable
 fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesViewModel) {
-  val notificationPermissionState =
-    CheckifItNeedsToRequestNotificationPermission(sharedPreferencesViewModel)
+    val notificationPermissionState =
+        CheckifItNeedsToRequestNotificationPermission(sharedPreferencesViewModel)

-  if (notificationPermissionState.status.isGranted) {
-    if (!sharedPreferencesViewModel.sharedPrefs.dontShowPushNotificationSelector) {
-      val context = LocalContext.current
-      var distributorPresent by remember {
-        mutableStateOf(PushDistributorHandler.savedDistributorExists())
-      }
-      if (!distributorPresent) {
-        LoadDistributors { currentDistributor, list, readableListWithExplainer ->
-          if (readableListWithExplainer.size > 1) {
-            SpinnerSelectionDialog(
-              title = stringResource(id = R.string.select_push_server),
-              options = readableListWithExplainer,
-              onSelect = { index ->
-                if (list[index] == "None") {
-                  PushDistributorHandler.forceRemoveDistributor(context)
-                  sharedPreferencesViewModel.dontAskForNotificationPermissions()
-                  sharedPreferencesViewModel.dontShowPushNotificationSelector()
-                } else {
-                  val fullDistributorName = list[index]
-                  PushDistributorHandler.saveDistributor(fullDistributorName)
-                }
-                distributorPresent = true
-                Log.d("Amethyst", "NotificationScreen: Distributor registered.")
-              },
-              onDismiss = {
-                distributorPresent = true
-                Log.d("Amethyst", "NotificationScreen: Distributor dialog dismissed.")
-              },
-            )
-          } else {
-            AlertDialog(
-              onDismissRequest = { distributorPresent = true },
-              title = { Text(stringResource(R.string.push_server_install_app)) },
-              text = {
-                Material3RichText(
-                  style = RichTextStyle().resolveDefaults(),
-                ) {
-                  Markdown(
-                    content = stringResource(R.string.push_server_install_app_description),
-                  )
-                }
-              },
-              confirmButton = {
-                Row(
-                  modifier = Modifier.padding(all = 8.dp).fillMaxWidth(),
-                  horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                  TextButton(
-                    onClick = {
-                      distributorPresent = true
-                      sharedPreferencesViewModel.dontShowPushNotificationSelector()
-                    },
-                  ) {
-                    Text(stringResource(R.string.quick_action_dont_show_again_button))
-                  }
-                  Button(
-                    onClick = { distributorPresent = true },
-                    contentPadding = PaddingValues(horizontal = 16.dp),
-                  ) {
-                    Row(
-                      verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                      Icon(
-                        imageVector = Icons.Default.Check,
-                        contentDescription = null,
-                      )
-                      Spacer(Modifier.width(8.dp))
-                      Text(stringResource(R.string.error_dialog_button_ok))
+    if (notificationPermissionState.status.isGranted) {
+        if (!sharedPreferencesViewModel.sharedPrefs.dontShowPushNotificationSelector) {
+            val context = LocalContext.current
+            var distributorPresent by remember {
+                mutableStateOf(PushDistributorHandler.savedDistributorExists())
+            }
+            if (!distributorPresent) {
+                LoadDistributors { currentDistributor, list, readableListWithExplainer ->
+                    if (readableListWithExplainer.size > 1) {
+                        SpinnerSelectionDialog(
+                            title = stringResource(id = R.string.select_push_server),
+                            options = readableListWithExplainer,
+                            onSelect = { index ->
+                                if (list[index] == "None") {
+                                    PushDistributorHandler.forceRemoveDistributor(context)
+                                    sharedPreferencesViewModel.dontAskForNotificationPermissions()
+                                    sharedPreferencesViewModel.dontShowPushNotificationSelector()
+                                } else {
+                                    val fullDistributorName = list[index]
+                                    PushDistributorHandler.saveDistributor(fullDistributorName)
+                                }
+                                distributorPresent = true
+                                Log.d("Amethyst", "NotificationScreen: Distributor registered.")
+                            },
+                            onDismiss = {
+                                distributorPresent = true
+                                Log.d("Amethyst", "NotificationScreen: Distributor dialog dismissed.")
+                            },
+                        )
+                    } else {
+                        AlertDialog(
+                            onDismissRequest = { distributorPresent = true },
+                            title = { Text(stringResource(R.string.push_server_install_app)) },
+                            text = {
+                                Material3RichText(
+                                    style = RichTextStyle().resolveDefaults(),
+                                ) {
+                                    Markdown(
+                                        content = stringResource(R.string.push_server_install_app_description),
+                                    )
+                                }
+                            },
+                            confirmButton = {
+                                Row(
+                                    modifier = Modifier.padding(all = 8.dp).fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.SpaceBetween,
+                                ) {
+                                    TextButton(
+                                        onClick = {
+                                            distributorPresent = true
+                                            sharedPreferencesViewModel.dontShowPushNotificationSelector()
+                                        },
+                                    ) {
+                                        Text(stringResource(R.string.quick_action_dont_show_again_button))
+                                    }
+                                    Button(
+                                        onClick = { distributorPresent = true },
+                                        contentPadding = PaddingValues(horizontal = 16.dp),
+                                    ) {
+                                        Row(
+                                            verticalAlignment = Alignment.CenterVertically,
+                                        ) {
+                                            Icon(
+                                                imageVector = Icons.Default.Check,
+                                                contentDescription = null,
+                                            )
+                                            Spacer(Modifier.width(8.dp))
+                                            Text(stringResource(R.string.error_dialog_button_ok))
+                                        }
+                                    }
+                                }
+                            },
+                        )
                    }
-                  }
                }
-              },
-            )
-          }
+            } else {
+                val currentDistributor = PushDistributorHandler.getSavedDistributor()
+                PushDistributorHandler.saveDistributor(currentDistributor)
+            }
        }
-      } else {
-        val currentDistributor = PushDistributorHandler.getSavedDistributor()
-        PushDistributorHandler.saveDistributor(currentDistributor)
-      }
    }
-  }
 }

@Composable
-fun LoadDistributors(
-  onInner: @Composable (String, ImmutableList<String>, ImmutableList<TitleExplainer>) -> Unit
-) {
-  val currentDistributor = PushDistributorHandler.getSavedDistributor().ifBlank { null } ?: "None"
+fun LoadDistributors(onInner: @Composable (String, ImmutableList<String>, ImmutableList<TitleExplainer>) -> Unit) {
+    val currentDistributor = PushDistributorHandler.getSavedDistributor().ifBlank { null } ?: "None"

-  val list = remember {
-    PushDistributorHandler.getInstalledDistributors().plus("None").toImmutableList()
-  }
+    val list =
+        remember {
+            PushDistributorHandler.getInstalledDistributors().plus("None").toImmutableList()
+        }

-  val readableListWithExplainer =
-    PushDistributorHandler.formattedDistributorNames()
-      .mapIndexed { index, name ->
-        TitleExplainer(
-          name,
-          stringResource(id = R.string.push_server_uses_app_explainer, list[index]),
-        )
-      }
-      .plus(
-        TitleExplainer(
-          stringResource(id = R.string.push_server_none),
-          stringResource(id = R.string.push_server_none_explainer),
-        ),
-      )
-      .toImmutableList()
+    val readableListWithExplainer =
+        PushDistributorHandler.formattedDistributorNames()
+            .mapIndexed { index, name ->
+                TitleExplainer(
+                    name,
+                    stringResource(id = R.string.push_server_uses_app_explainer, list[index]),
+                )
+            }
+            .plus(
+                TitleExplainer(
+                    stringResource(id = R.string.push_server_none),
+                    stringResource(id = R.string.push_server_none_explainer),
+                ),
+            )
+            .toImmutableList()

-  onInner(
-    currentDistributor,
-    list,
-    readableListWithExplainer,
-  )
+    onInner(
+        currentDistributor,
+        list,
+        readableListWithExplainer,
+    )
 }

@Composable
 fun PushNotificationSettingsRow(sharedPreferencesViewModel: SharedPreferencesViewModel) {
-  val context = LocalContext.current
+    val context = LocalContext.current

-  LoadDistributors { currentDistributor, list, readableListWithExplainer ->
-    SettingsRow(
-      R.string.push_server_title,
-      R.string.push_server_explainer,
-      selectedItens = readableListWithExplainer,
-      selectedIndex = list.indexOf(currentDistributor),
-    ) { index ->
-      if (list[index] == "None") {
-        sharedPreferencesViewModel.dontAskForNotificationPermissions()
-        sharedPreferencesViewModel.dontShowPushNotificationSelector()
-        PushDistributorHandler.forceRemoveDistributor(context)
-      } else {
-        PushDistributorHandler.saveDistributor(list[index])
-      }
+    LoadDistributors { currentDistributor, list, readableListWithExplainer ->
+        SettingsRow(
+            R.string.push_server_title,
+            R.string.push_server_explainer,
+            selectedItens = readableListWithExplainer,
+            selectedIndex = list.indexOf(currentDistributor),
+        ) { index ->
+            if (list[index] == "None") {
+                sharedPreferencesViewModel.dontAskForNotificationPermissions()
+                sharedPreferencesViewModel.dontShowPushNotificationSelector()
+                PushDistributorHandler.forceRemoveDistributor(context)
+            } else {
+                PushDistributorHandler.saveDistributor(list[index])
+            }
+        }
    }
-  }
 }
@@ -29,15 +29,14 @@ import com.vitorpamplona.quartz.events.ImmutableListOfLists

@Composable
 fun TranslatableRichTextViewer(
-  content: String,
-  canPreview: Boolean,
-  modifier: Modifier = Modifier,
-  tags: ImmutableListOfLists<String>,
-  backgroundColor: MutableState<Color>,
-  accountViewModel: AccountViewModel,
-  nav: (String) -> Unit,
-) =
-  ExpandableRichTextViewer(
+    content: String,
+    canPreview: Boolean,
+    modifier: Modifier = Modifier,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) = ExpandableRichTextViewer(
    content,
    canPreview,
    modifier,
@@ -45,4 +44,4 @@ fun TranslatableRichTextViewer(
    backgroundColor,
    accountViewModel,
    nav,
-  )
+)