diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorderFocusManager.kt b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorderFocusManager.kt index 6ff3c2c57..0b53ef6f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorderFocusManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorderFocusManager.kt @@ -51,6 +51,7 @@ private class AudioRecorderFocusManager26(context: Context, changeListener: OnAu } } +@Suppress("DEPRECATION") private class AudioRecorderFocusManagerLegacy(context: Context, val changeListener: OnAudioFocusChangeListener) : AudioRecorderFocusManager(context) { override fun requestAudioFocus(): Int { return audioManager.requestAudioFocus(changeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE) diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt index 3acd7eaf8..7257e481a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt @@ -30,6 +30,7 @@ class TextAvatarDrawable( setBounds(0, 0, size, size) } + @Suppress("DEPRECATION") override fun draw(canvas: Canvas) { val width = bounds.width() val textSize = Avatars.getTextSizeForLength(context, avatar.text, width * 0.8f, width * 0.45f) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowActivity.kt index 713fb07a8..783af0921 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowActivity.kt @@ -31,6 +31,7 @@ class GiftFlowActivity : FragmentWrapperActivity(), DonationPaymentComponent { return NavHostFragment.create(R.navigation.gift_flow) } + @Suppress("DEPRECATION") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) googlePayResultPublisher.onNext(DonationPaymentComponent.GooglePayResult(requestCode, resultCode, data)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt index 0701362b1..ea9e77a1d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt @@ -122,6 +122,7 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent { } } + @Suppress("DEPRECATION") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) googlePayResultPublisher.onNext(DonationPaymentComponent.GooglePayResult(requestCode, resultCode, data)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt index 0644a7668..9960947ae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt @@ -344,7 +344,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac if (!ServiceUtil.getKeyguardManager(requireContext()).isKeyguardSecure) { showGoToPhoneSettings() } else if (state.paymentLock) { - biometricAuth.authenticate(requireContext(), true) { biometricDeviceLockLauncher?.launch(getString(R.string.BiometricDeviceAuthentication__signal)) } + biometricAuth.authenticate(requireContext(), true) { biometricDeviceLockLauncher.launch(getString(R.string.BiometricDeviceAuthentication__signal)) } } else { viewModel.togglePaymentLock(true) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeDonationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeDonationRepository.kt index e04901954..ff361ed67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeDonationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeDonationRepository.kt @@ -29,7 +29,7 @@ class OneTimeDonationRepository(private val donationsService: DonationsService) companion object { private val TAG = Log.tag(OneTimeDonationRepository::class.java) - fun handleCreatePaymentIntentError(throwable: Throwable, badgeRecipient: RecipientId, paymentSourceType: PaymentSourceType): Single { + fun handleCreatePaymentIntentError(throwable: Throwable, badgeRecipient: RecipientId, paymentSourceType: PaymentSourceType): Single { return if (throwable is DonationError) { Single.error(throwable) } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalActivity.kt index ce6cafbd9..b13405a7d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalActivity.kt @@ -23,6 +23,7 @@ class DonateToSignalActivity : FragmentWrapperActivity(), DonationPaymentCompone return NavHostFragment.create(R.navigation.donate_to_signal, DonateToSignalFragmentArgs.Builder(DonateToSignalType.ONE_TIME).build().toBundle()) } + @Suppress("DEPRECATION") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) googlePayResultPublisher.onNext(DonationPaymentComponent.GooglePayResult(requestCode, resultCode, data)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt index eeb6eac6a..144f1ecfe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt @@ -84,7 +84,7 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) { binding.cardNumber.addTextChangedListener(CreditCardTextWatcher()) - binding.cardNumber.setOnFocusChangeListener { v, hasFocus -> + binding.cardNumber.setOnFocusChangeListener { _, hasFocus -> viewModel.onNumberFocusChanged(hasFocus) } @@ -92,7 +92,7 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) { viewModel.onCodeChanged(it?.toString() ?: "") }) - binding.cardCvv.setOnFocusChangeListener { v, hasFocus -> + binding.cardCvv.setOnFocusChangeListener { _, hasFocus -> viewModel.onCodeFocusChanged(hasFocus) } @@ -111,7 +111,7 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) { binding.cardExpiry.addTextChangedListener(CreditCardExpirationTextWatcher()) - binding.cardExpiry.setOnFocusChangeListener { v, hasFocus -> + binding.cardExpiry.setOnFocusChangeListener { _, hasFocus -> viewModel.onExpirationFocusChanged(hasFocus) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt index be10a88e5..60ad77c18 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt @@ -77,7 +77,7 @@ class ManageDonationsViewModel( disposables += SubscriptionRedemptionJobWatcher.watch().subscribeBy { jobStateOptional -> store.update { manageDonationsState -> manageDonationsState.copy( - subscriptionRedemptionState = jobStateOptional.map { jobState -> + subscriptionRedemptionState = jobStateOptional.map { jobState: JobTracker.JobState -> when (jobState) { JobTracker.JobState.PENDING -> ManageDonationsState.SubscriptionRedemptionState.IN_PROGRESS JobTracker.JobState.RUNNING -> ManageDonationsState.SubscriptionRedemptionState.IN_PROGRESS diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt index 7538d7886..0c0b88560 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt @@ -57,6 +57,7 @@ open class ConversationActivity : PassphraseRequiredActivity(), ConversationPare replaceFragment(intent!!) } + @Suppress("DEPRECATION") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) googlePayResultPublisher.onNext(DonationPaymentComponent.GooglePayResult(requestCode, resultCode, data)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt index 432c6ec24..a2d604f65 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt @@ -29,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R +import org.thoughtcrime.securesms.color.ViewColorSet import org.thoughtcrime.securesms.components.ContactFilterView import org.thoughtcrime.securesms.components.TooltipPopup import org.thoughtcrime.securesms.components.WrapperDialogFragment @@ -146,11 +147,9 @@ class MultiselectForwardFragment : val sendButton: AppCompatImageView = bottomBar.findViewById(R.id.share_confirm) val backgroundHelper: View = bottomBar.findViewById(R.id.background_helper) - val sendButtonColors = args.sendButtonColors - if (sendButtonColors != null) { - sendButton.setColorFilter(sendButtonColors.foreground.resolve(requireContext())) - ViewCompat.setBackgroundTintList(sendButton, ColorStateList.valueOf(sendButtonColors.background.resolve(requireContext()))) - } + val sendButtonColors: ViewColorSet = args.sendButtonColors + sendButton.setColorFilter(sendButtonColors.foreground.resolve(requireContext())) + ViewCompat.setBackgroundTintList(sendButton, ColorStateList.valueOf(sendButtonColors.background.resolve(requireContext()))) FullscreenHelper.configureBottomBarLayout(requireActivity(), bottomBarSpacer, bottomBar) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt index 68f10188c..e48676a7d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt @@ -2186,7 +2186,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da } fun bulkUpdatedRegisteredStatus(registered: Map, unregistered: Collection) { - writableDatabase.withinTransaction { db -> + writableDatabase.withinTransaction { val registeredWithServiceId: Set = getRegisteredWithServiceIds() val needsMarkRegistered: Map = registered - registeredWithServiceId @@ -2855,7 +2855,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da operations += PnpOperation.ChangeNumberInsert( recipientId = data.byAciSid, oldE164 = data.aciSidRecord.e164, - newE164 = e164!! + newE164 = e164 ) } } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt index 6cbc7267e..44d6cbaf5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt @@ -15,6 +15,7 @@ import org.signal.core.util.delete import org.signal.core.util.logging.Log import org.signal.core.util.or import org.signal.core.util.readToList +import org.signal.core.util.readToSingleLong import org.signal.core.util.requireBoolean import org.signal.core.util.requireInt import org.signal.core.util.requireLong @@ -1072,13 +1073,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa .from(TABLE_NAME) .where("$RECIPIENT_ID = ?", recipientId) .run() - .use { cursor -> - return if (cursor.moveToFirst()) { - cursor.requireLong(ID) - } else { - -1 - } - } + .readToSingleLong(-1) } fun getOrCreateValidThreadId(recipient: Recipient, candidateId: Long): Long { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt index 078a1a54d..62fbe9e04 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt @@ -19,7 +19,7 @@ enum class StoryViewState { companion object { @JvmStatic fun getForRecipientId(recipientId: RecipientId): Observable { - if (recipientId.equals(Recipient.self().id)) { + if (recipientId == Recipient.self().id) { return Observable.fromCallable { SignalDatabase.recipients.getDistributionListRecipientIds() }.flatMap { ids -> @@ -27,7 +27,7 @@ enum class StoryViewState { if (combined.isEmpty()) { NONE } else { - val results = combined.toList() as List + val results: List = combined.filterIsInstance() when { results.any { it == UNVIEWED } -> UNVIEWED results.any { it == VIEWED } -> VIEWED diff --git a/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/SetSignalAsDefaultSmsAppFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/SetSignalAsDefaultSmsAppFragment.kt index e0e39778a..11d6584d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/SetSignalAsDefaultSmsAppFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/SetSignalAsDefaultSmsAppFragment.kt @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.exporter.flow -import android.content.Intent import android.os.Bundle import android.view.View +import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import org.signal.smsexporter.BecomeSmsAppFailure @@ -12,17 +12,20 @@ import org.thoughtcrime.securesms.databinding.SetSignalAsDefaultSmsAppFragmentBi import org.thoughtcrime.securesms.util.navigation.safeNavigate class SetSignalAsDefaultSmsAppFragment : Fragment(R.layout.set_signal_as_default_sms_app_fragment) { - companion object { - private const val REQUEST_CODE = 1 - } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { val binding = SetSignalAsDefaultSmsAppFragmentBinding.bind(view) + val smsDefaultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + if (DefaultSmsHelper.isDefaultSms(requireContext())) { + navigateToExporter() + } + } + binding.continueButton.setOnClickListener { DefaultSmsHelper.becomeDefaultSms(requireContext()).either( onSuccess = { - startActivityForResult(it, REQUEST_CODE) + smsDefaultLauncher.launch(it) }, onFailure = { when (it) { @@ -34,12 +37,6 @@ class SetSignalAsDefaultSmsAppFragment : Fragment(R.layout.set_signal_as_default } } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (requestCode == REQUEST_CODE && DefaultSmsHelper.isDefaultSms(requireContext())) { - navigateToExporter() - } - } - private fun navigateToExporter() { findNavController().safeNavigate(SetSignalAsDefaultSmsAppFragmentDirections.actionSetSignalAsDefaultSmsAppFragmentToExportingSmsMessagesFragment()) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchDialogFragment.kt index 8570ac58a..d58e600f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchDialogFragment.kt @@ -54,7 +54,7 @@ class StickerSearchDialogFragment : DialogFragment(), KeyboardStickerListAdapter list.adapter = adapter list.addItemDecoration(InsetItemDecoration(StickerInsetSetter())) - val viewModel: StickerSearchViewModel = ViewModelProvider(this, StickerSearchViewModel.Factory(requireContext())).get(StickerSearchViewModel::class.java) + val viewModel: StickerSearchViewModel = ViewModelProvider(this, StickerSearchViewModel.Factory()).get(StickerSearchViewModel::class.java) viewModel.searchResults.observe(viewLifecycleOwner) { stickers -> adapter.submitList(stickers) diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchViewModel.kt index 8632fb6db..4f510c946 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchViewModel.kt @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.keyboard.sticker -import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel @@ -20,7 +19,7 @@ class StickerSearchViewModel(private val searchRepository: StickerSearchReposito searchQuery.postValue(query) } - class Factory(context: Context) : ViewModelProvider.Factory { + class Factory : ViewModelProvider.Factory { val repository = StickerSearchRepository() override fun create(modelClass: Class): T { diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt index 931648722..79ffeca7e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt @@ -310,7 +310,7 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal } if (previous && !registered) { - clearLocalCredentials(ApplicationDependencies.getApplication()) + clearLocalCredentials() } } @@ -329,7 +329,7 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal val isLinkedDevice: Boolean get() = !isPrimaryDevice - private fun clearLocalCredentials(context: Context) { + private fun clearLocalCredentials() { putString(KEY_SERVICE_PASSWORD, Util.getSecret(18)) val newProfileKey = ProfileKeyUtil.createNew() diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegates.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegates.kt index 354816c76..0a49e3d59 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegates.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegates.kt @@ -70,6 +70,7 @@ private class BooleanValue(private val key: String, private val default: Boolean private class StringValue(private val key: String, private val default: T, store: KeyValueStore) : SignalStoreValueDelegate(store) { override fun getValue(values: KeyValueStore): T { + @Suppress("UNCHECKED_CAST") return values.getString(key, default) as T } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt index 7c2fbb9d3..cfaf3cdd7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt @@ -181,7 +181,7 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med when (currentState.loadState) { MediaPreviewV2State.LoadState.DATA_LOADED -> bindDataLoadedState(currentState) MediaPreviewV2State.LoadState.MEDIA_READY -> bindMediaReadyState(currentState) - else -> null + else -> Unit } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt index e9ca901e9..2312f4591 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt @@ -99,7 +99,7 @@ data class NotificationConversation( return notificationItems.any { it.isNewNotification } } - fun getChannelId(context: Context): String { + fun getChannelId(): String { return if (isOnlyContactJoinedEvent) { NotificationChannels.getInstance().JOIN_EVENTS } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt index 43ebba0ec..c165e8e16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt @@ -188,7 +188,7 @@ object NotificationFactory { setCategory(NotificationCompat.CATEGORY_MESSAGE) setGroup(DefaultMessageNotifier.NOTIFICATION_GROUP) setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN) - setChannelId(conversation.getChannelId(context)) + setChannelId(conversation.getChannelId()) setContentTitle(conversation.getContentTitle(context)) setLargeIcon(conversation.getContactLargeIcon(context).toLargeBitmap(context)) addPerson(conversation.recipient) @@ -221,7 +221,7 @@ object NotificationFactory { val notificationId: Int = if (Build.VERSION.SDK_INT < 24) NotificationIds.MESSAGE_SUMMARY else conversation.notificationId - NotificationManagerCompat.from(context).safelyNotify(context, conversation.recipient, notificationId, builder.build()) + NotificationManagerCompat.from(context).safelyNotify(conversation.recipient, notificationId, builder.build()) } private fun notifySummary(context: Context, state: NotificationState) { @@ -257,7 +257,7 @@ object NotificationFactory { } Log.d(TAG, "showing summary notification") - NotificationManagerCompat.from(context).safelyNotify(context, null, NotificationIds.MESSAGE_SUMMARY, builder.build()) + NotificationManagerCompat.from(context).safelyNotify(null, NotificationIds.MESSAGE_SUMMARY, builder.build()) } private fun notifyInThread(context: Context, recipient: Recipient, lastAudibleNotification: Long) { @@ -326,7 +326,7 @@ object NotificationFactory { setChannelId(NotificationChannels.getInstance().FAILURES) } - NotificationManagerCompat.from(context).safelyNotify(context, recipient, NotificationIds.getNotificationIdForMessageDeliveryFailed(thread), builder.build()) + NotificationManagerCompat.from(context).safelyNotify(recipient, NotificationIds.getNotificationIdForMessageDeliveryFailed(thread), builder.build()) } fun notifyProofRequired(context: Context, recipient: Recipient, thread: ConversationId, visibleThread: ConversationId?) { @@ -356,7 +356,7 @@ object NotificationFactory { setChannelId(NotificationChannels.getInstance().FAILURES) } - NotificationManagerCompat.from(context).safelyNotify(context, recipient, NotificationIds.getNotificationIdForMessageDeliveryFailed(thread), builder.build()) + NotificationManagerCompat.from(context).safelyNotify(recipient, NotificationIds.getNotificationIdForMessageDeliveryFailed(thread), builder.build()) } @JvmStatic @@ -379,7 +379,7 @@ object NotificationFactory { setColor(ContextCompat.getColor(context, R.color.core_ultramarine)) setCategory(NotificationCompat.CATEGORY_MESSAGE) setGroup(DefaultMessageNotifier.NOTIFICATION_GROUP) - setChannelId(conversation.getChannelId(context)) + setChannelId(conversation.getChannelId()) setContentTitle(conversation.getContentTitle(context)) setLargeIcon(conversation.getContactLargeIcon(context).toLargeBitmap(context)) addPerson(conversation.recipient) @@ -390,10 +390,10 @@ object NotificationFactory { } Log.d(TAG, "Posting Notification for requested bubble") - NotificationManagerCompat.from(context).safelyNotify(context, recipient, conversation.notificationId, builder.build()) + NotificationManagerCompat.from(context).safelyNotify(recipient, conversation.notificationId, builder.build()) } - private fun NotificationManagerCompat.safelyNotify(context: Context, threadRecipient: Recipient?, notificationId: Int, notification: Notification) { + private fun NotificationManagerCompat.safelyNotify(threadRecipient: Recipient?, notificationId: Int, notification: Notification) { try { notify(notificationId, notification) Log.internal().i(TAG, "Posted notification: $notification") diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt index b71a3a40b..3677d6331 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt @@ -231,9 +231,6 @@ class ImageEditorHudV2 @JvmOverloads constructor( isAvatarEdit = true } - fun setColorPalette(colors: Set) { - } - fun getActiveColor(): Int { return if (currentMode == Mode.HIGHLIGHT) { withHighlighterAlpha(drawSeekBar.getColor()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt index 04abf3f92..962d0f16a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt @@ -105,7 +105,7 @@ class StoriesLandingRepository(context: Context) { Observable.just(emptyList()) } else { Observable.combineLatest(observables) { - it.toList() as List + it.filterIsInstance() } } }.subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt index 183193ea5..3847002d6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt @@ -158,7 +158,7 @@ open class StoryViewerPageRepository(context: Context, private val storyViewStat if (posts.isEmpty()) { Observable.just(emptyList()) } else { - Observable.combineLatest(posts) { it.toList() as List } + Observable.combineLatest(posts) { it.filterIsInstance() } } }.observeOn(Schedulers.io()) } diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt index 519de9448..29d3d2d75 100644 --- a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt +++ b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt @@ -58,7 +58,7 @@ class SpinnerApplicationContext : ApplicationContext() { "E164" to (SignalStore.account().e164 ?: "none"), "ACI" to (SignalStore.account().aci?.toString() ?: "none"), "PNI" to (SignalStore.account().pni?.toString() ?: "none"), - Spinner.KEY_ENVIRONMENT to BuildConfig.FLAVOR_environment.toUpperCase(Locale.US) + Spinner.KEY_ENVIRONMENT to BuildConfig.FLAVOR_environment.uppercase(Locale.US) ), linkedMapOf( "signal" to DatabaseConfig(