Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,8 @@ android {
dependencies {
implementation(project(":content-descriptions"))

ksp(libs.androidx.hilt.compiler)
// ksp(libs.androidx.hilt.compiler)
ksp(libs.dagger.hilt.compiler)
ksp(libs.glide.ksp)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.hilt.work)
implementation(libs.roundedimageview)
Expand Down Expand Up @@ -484,6 +483,8 @@ dependencies {
debugImplementation(libs.sqlite.web.viewer)
}



fun getLastCommitTimestamp(): String {
return ByteArrayOutputStream().use { os ->
os.toString() + "000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ package org.session.libsession.messaging.utilities

import kotlinx.coroutines.channels.Channel
import org.session.libsession.messaging.messages.control.CallMessage
import java.util.*

object WebRtcUtils {

// TODO: move this to a better place that is persistent
val SIGNAL_QUEUE = Channel<CallMessage>(Channel.UNLIMITED)
val callCache: MutableMap<UUID, MutableSet<CallMessage>> = mutableMapOf()

}
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ interface TextSecurePreferences {

@JvmStatic
fun getNotificationLedColor(context: Context): Int {
return getIntegerPreference(context, LED_COLOR_PREF_PRIMARY, ThemeUtil.getThemedColor(context, R.attr.colorAccent))
return getIntegerPreference(context, LED_COLOR_PREF_PRIMARY, ThemeUtil.getThemedColor(context, androidx.appcompat.R.attr.colorAccent))
}

@JvmStatic
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/DeviceModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import network.loki.messenger.BuildConfig
import org.session.libsession.utilities.Device
import javax.inject.Singleton

@Module
@InstallIn(SingletonComponent::class)
object DeviceModule {
@Provides
@Singleton
fun provides() = BuildConfig.DEVICE
fun provides(): Device = BuildConfig.DEVICE
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class SessionDialogBuilder(val context: Context) {
fun title(text: String?) {
text(
text = text,
qaTag = context.getString(R.string.AccessibilityId_modalTitle),
qaTag = context.getString(org.session.content_descriptions.R.string.AccessibilityId_modalTitle),
style = R.style.TextAppearance_Session_Dialog_Title) { setPadding(dp20, 0, dp20, 0) }
}

Expand All @@ -86,7 +86,7 @@ class SessionDialogBuilder(val context: Context) {

private fun text(
text: CharSequence?,
qaTag: String = context.getString(R.string.AccessibilityId_modalMessage),
qaTag: String = context.getString(org.session.content_descriptions.R.string.AccessibilityId_modalMessage),
@StyleRes style: Int? = null,
modify: TextView.() -> Unit
) {
Expand Down Expand Up @@ -160,7 +160,7 @@ class SessionDialogBuilder(val context: Context) {

fun okButton(listener: (() -> Unit) = {}) = button(android.R.string.ok) { listener() }

fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel) { listener() }
fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, org.session.content_descriptions.R.string.AccessibilityId_cancel) { listener() }

fun button(
@StringRes text: Int,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fun ShareList(
placeholder = stringResource(R.string.search),
modifier = Modifier
.padding(horizontal = LocalDimensions.current.smallSpacing)
.qaTag(R.string.AccessibilityId_groupNameSearch),
.qaTag(org.session.content_descriptions.R.string.AccessibilityId_groupNameSearch),
backgroundColor = LocalColors.current.backgroundSecondary,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public EmojiEditText(Context context) {
}

public EmojiEditText(Context context, AttributeSet attrs) {
this(context, attrs, R.attr.editTextStyle);
this(context, attrs, androidx.appcompat.R.attr.editTextStyle);
}

public EmojiEditText(Context context, AttributeSet attrs, int defStyleAttr) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public EmojiVariationSelectorPopup(@NonNull Context context, @NonNull EmojiEvent
this.list = (ViewGroup) getContentView();

setBackgroundDrawable(
new ColorDrawable(ThemeUtil.getThemedColor(context, R.attr.colorPrimary))
new ColorDrawable(ThemeUtil.getThemedColor(context, androidx.appcompat.R.attr.colorPrimary))
);
setOutsideTouchable(true);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class DisappearingMessages @Inject constructor(
ExpiryMode.NONE -> {
bodyText = context.getText(R.string.disappearingMessagesFollowSettingOff)
dangerButtonText = R.string.confirm
dangerButtonContentDescription = R.string.AccessibilityId_confirm
dangerButtonContentDescription = org.session.content_descriptions.R.string.AccessibilityId_confirm
}
is ExpiryMode.AfterSend -> {
bodyText = context.getSubbedCharSequence(
Expand All @@ -80,7 +80,7 @@ class DisappearingMessages @Inject constructor(
)

dangerButtonText = R.string.set
dangerButtonContentDescription = R.string.AccessibilityId_setButton
dangerButtonContentDescription = org.session.content_descriptions.R.string.AccessibilityId_setButton
}
is ExpiryMode.AfterRead -> {
bodyText = context.getSubbedCharSequence(
Expand All @@ -93,7 +93,7 @@ class DisappearingMessages @Inject constructor(
)

dangerButtonText = R.string.set
dangerButtonContentDescription = R.string.AccessibilityId_setButton
dangerButtonContentDescription = org.session.content_descriptions.R.string.AccessibilityId_setButton
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ enum class ExpiryType(
NONE(
{ ExpiryMode.NONE },
R.string.off,
contentDescription = R.string.AccessibilityId_disappearingMessagesOff,
contentDescription = org.session.content_descriptions.R.string.AccessibilityId_disappearingMessagesOff,
),
AFTER_READ(
ExpiryMode::AfterRead,
R.string.disappearingMessagesDisappearAfterRead,
R.string.disappearingMessagesDisappearAfterReadDescription,
R.string.AccessibilityId_disappearingMessagesDisappearAfterRead
org.session.content_descriptions.R.string.AccessibilityId_disappearingMessagesDisappearAfterRead
),
AFTER_SEND(
ExpiryMode::AfterSend,
R.string.disappearingMessagesDisappearAfterSend,
R.string.disappearingMessagesDisappearAfterSendDescription,
R.string.AccessibilityId_disappearingMessagesDisappearAfterSent
org.session.content_descriptions.R.string.AccessibilityId_disappearingMessagesDisappearAfterSent
);

fun mode(seconds: Long) = if (seconds != 0L) createMode(seconds) else ExpiryMode.NONE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fun DisappearingMessages(
AccentOutlineButton(
stringResource(R.string.set),
modifier = Modifier
.qaTag(R.string.AccessibilityId_setButton)
.qaTag(org.session.content_descriptions.R.string.AccessibilityId_setButton)
.align(Alignment.CenterHorizontally)
.padding(bottom = LocalDimensions.current.spacing),
enabled = !state.disableSetButton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
showSessionDialog {
title(R.string.callsPermissionsRequired)
text(R.string.callsPermissionsRequiredDescription)
button(R.string.sessionSettings, R.string.AccessibilityId_sessionSettings) {
button(R.string.sessionSettings, org.session.content_descriptions.R.string.AccessibilityId_sessionSettings) {
val intent = Intent(context, PrivacySettingsActivity::class.java)
// allow the screen to auto scroll to the appropriate toggle
intent.putExtra(PrivacySettingsActivity.SCROLL_AND_TOGGLE_KEY, CALL_NOTIFICATIONS_ENABLED)
Expand Down Expand Up @@ -1576,7 +1576,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
.put(NAME_KEY, name)
.format()
)
dangerButton(R.string.block, R.string.AccessibilityId_blockConfirm) {
dangerButton(R.string.block, org.session.content_descriptions.R.string.AccessibilityId_blockConfirm) {
viewModel.block()

// Block confirmation toast added as per SS-64
Expand All @@ -1603,7 +1603,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
.put(NAME_KEY, recipient.displayName())
.format()
)
dangerButton(R.string.blockUnblock, R.string.AccessibilityId_unblockConfirm) { viewModel.unblock() }
dangerButton(R.string.blockUnblock, org.session.content_descriptions.R.string.AccessibilityId_unblockConfirm) { viewModel.unblock() }
cancelButton()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -599,15 +599,15 @@ class ConversationReactionOverlay : FrameLayout {
R.attr.menu_select_icon,
R.string.select,
{ handleActionItemClicked(Action.SELECT) },
R.string.AccessibilityId_select
org.session.content_descriptions.R.string.AccessibilityId_select
)
}

// Reply
val canWrite = openGroup == null || openGroup.write
if (canWrite && !message.isPending && !message.isFailed && !message.isOpenGroupInvitation && !isDeleteOnly
&& !isDeprecatedLegacyGroup) {
items += ActionItem(R.attr.menu_reply_icon, R.string.reply, { handleActionItemClicked(Action.REPLY) }, R.string.AccessibilityId_reply)
items += ActionItem(R.attr.menu_reply_icon, R.string.reply, { handleActionItemClicked(Action.REPLY) }, org.session.content_descriptions.R.string.AccessibilityId_reply)
}
// Copy message text
if (!containsControlMessage && hasText && !isDeleteOnly) {
Expand All @@ -623,7 +623,7 @@ class ConversationReactionOverlay : FrameLayout {
R.attr.menu_trash_icon,
R.string.delete,
{ handleActionItemClicked(Action.DELETE) },
R.string.AccessibilityId_deleteMessage,
org.session.content_descriptions.R.string.AccessibilityId_deleteMessage,
message.subtitle,
ThemeUtil.getThemedColor(context, R.attr.danger)
)
Expand Down Expand Up @@ -660,7 +660,7 @@ class ConversationReactionOverlay : FrameLayout {
items += ActionItem(R.attr.menu_save_icon,
R.string.save,
{ handleActionItemClicked(Action.DOWNLOAD) },
R.string.AccessibilityId_saveAttachment
org.session.content_descriptions.R.string.AccessibilityId_saveAttachment
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fun ConversationV2Dialogs(
option = RadioOption(
value = Unit,
title = GetString(stringResource(R.string.deleteMessageDeviceOnly)),
qaTag = GetString(stringResource(R.string.qa_delete_message_device_only)),
qaTag = GetString(stringResource(org.session.content_descriptions.R.string.qa_delete_message_device_only)),
selected = !deleteForEveryone
)
) {
Expand All @@ -119,7 +119,7 @@ fun ConversationV2Dialogs(
option = RadioOption(
value = Unit,
title = GetString(data.deleteForEveryoneLabel),
qaTag = GetString(stringResource(R.string.qa_delete_message_everyone)),
qaTag = GetString(stringResource(org.session.content_descriptions.R.string.qa_delete_message_everyone)),
selected = deleteForEveryone,
enabled = data.everyoneEnabled
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ class ConversationViewModel @AssistedInject constructor(
showDisappearingMessages(conversation)
},
icon = R.drawable.ic_clock_11,
qaTag = application.resources.getString(R.string.AccessibilityId_disappearingMessagesDisappear)
qaTag = application.resources.getString(org.session.content_descriptions.R.string.AccessibilityId_disappearingMessagesDisappear)
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ fun ExpandButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
) {
Icon(
painter = painterResource(id = R.drawable.ic_maximize_2),
contentDescription = stringResource(id = R.string.AccessibilityId_expand),
contentDescription = stringResource(id = org.session.content_descriptions.R.string.AccessibilityId_expand),
modifier = Modifier
.padding(LocalDimensions.current.xxsSpacing)
.size(LocalDimensions.current.xsSpacing),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.conversation.v2

import android.content.Context
import android.net.Uri
import android.text.format.Formatter
import androidx.annotation.DrawableRes
Expand All @@ -9,6 +10,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.channels.Channel
Expand All @@ -34,7 +36,6 @@ import org.session.libsession.utilities.recipients.Recipient
import org.session.libsession.utilities.recipients.RecipientData
import org.session.libsession.utilities.recipients.displayName
import org.session.libsignal.utilities.IdPrefix
import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.MediaPreviewArgs
import org.thoughtcrime.securesms.database.AttachmentDatabase
import org.thoughtcrime.securesms.database.LokiMessageDatabase
Expand Down Expand Up @@ -68,7 +69,7 @@ class MessageDetailsViewModel @AssistedInject constructor(
private val mmsSmsDatabase: MmsSmsDatabase,
private val threadDb: ThreadDatabase,
private val deprecationManager: LegacyGroupDeprecationManager,
private val context: ApplicationContext,
@param:ApplicationContext private val context: Context,
private val avatarUtils: AvatarUtils,
private val dateUtils: DateUtils,
private val recipientRepository: RecipientRepository,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class BlockedDialog(private val recipient: Address, private val contactName: Str

title(resources.getString(R.string.blockUnblock))
text(spannable)
dangerButton(R.string.blockUnblock, R.string.AccessibilityId_unblockConfirm) { unblock() }
dangerButton(R.string.blockUnblock, org.session.content_descriptions.R.string.AccessibilityId_unblockConfirm) { unblock() }
cancelButton { dismiss() }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AutoDownloadDialog(private val threadRecipient: Recipient,
.format()
text(explanation)

button(R.string.download, R.string.AccessibilityId_download) {
button(R.string.download, org.session.content_descriptions.R.string.AccessibilityId_download) {
setAutoDownload()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ class InputBar @JvmOverloads constructor(
lateinit var recipientRepository: RecipientRepository

private val attachmentsButton = InputBarButton(context, R.drawable.ic_plus).apply {
contentDescription = context.getString(R.string.AccessibilityId_attachmentsButton)
contentDescription = context.getString(org.session.content_descriptions.R.string.AccessibilityId_attachmentsButton)
}

val microphoneButton = InputBarButton(context, R.drawable.ic_mic).apply {
contentDescription = context.getString(R.string.AccessibilityId_voiceMessageNew)
contentDescription = context.getString(org.session.content_descriptions.R.string.AccessibilityId_voiceMessageNew)
}

private val sendButton = InputBarButton(context, R.drawable.ic_arrow_up, isSendButton = true).apply {
contentDescription = context.getString(R.string.AccessibilityId_send)
contentDescription = context.getString(org.session.content_descriptions.R.string.AccessibilityId_send)
}

private val textColor: Int by lazy {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class InputBarButton : RelativeLayout {
if (hasOpaqueBackground) {
R.attr.input_bar_button_background_opaque
} else if (isSendButton) {
R.attr.colorAccent
androidx.appcompat.R.attr.colorAccent
} else {
R.attr.input_bar_button_background
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class ControlMessageView : LinearLayout {
context.getString(R.string.messageRequestsAccepted)
}

binding.root.contentDescription = context.getString(R.string.AccessibilityId_message_request_config_message)
binding.root.contentDescription = context.getString(org.session.content_descriptions.R.string.AccessibilityId_message_request_config_message)
}
message.isCallLog -> {
val drawableRes = when {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ class QuoteView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
// region Convenience
@ColorInt private fun getLineColor(isOutgoingMessage: Boolean): Int {
return when {
mode == Mode.Regular && !isOutgoingMessage -> context.getColorFromAttr(R.attr.colorAccent)
mode == Mode.Regular && !isOutgoingMessage -> context.getColorFromAttr(androidx.appcompat.R.attr.colorAccent)
mode == Mode.Regular -> context.getColorFromAttr(R.attr.message_sent_text_color)
else -> context.getColorFromAttr(R.attr.colorAccent)
else -> context.getColorFromAttr(androidx.appcompat.R.attr.colorAccent)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ class VisibleMessageContentView : ConstraintLayout {
)
body = SearchUtil.getHighlightedSpan(Locale.getDefault(),
{
BackgroundColorSpan(context.getColorFromAttr(R.attr.colorPrimary))
BackgroundColorSpan(context.getColorFromAttr(androidx.appcompat.R.attr.colorPrimary))
}, body, searchQuery)
body = SearchUtil.getHighlightedSpan(Locale.getDefault(),
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class VisibleMessageView : FrameLayout {

private val swipeToReplyIcon by lazy {
val d = ContextCompat.getDrawable(context, R.drawable.ic_reply)!!.mutate()
d.setTint(context.getColorFromAttr(R.attr.colorControlNormal))
d.setTint(context.getColorFromAttr(androidx.appcompat.R.attr.colorControlNormal))
d
}
private val swipeToReplyIconRect = Rect()
Expand Down Expand Up @@ -343,7 +343,7 @@ class VisibleMessageView : FrameLayout {
messageStatus.messageTextRes?.let{
binding.messageStatusTextView.setText(it)
binding.messageStatusTextView.contentDescription =
context.getString(R.string.AccessibilityId_send_status)+
context.getString(org.session.content_descriptions.R.string.AccessibilityId_send_status)+
context.getString(it)
}
messageStatus.iconTint?.let(binding.messageStatusTextView::setTextColor)
Expand Down
Loading
Loading