Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: externalize all wire links to support custom builds (WPB-9811) 🍒 🍒 #3165

Merged
merged 3 commits into from
Jul 8, 2024
Merged

chore: externalize all wire links to support custom builds (WPB-9811) 🍒 🍒 #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7374992
Commit with unresolved merge conflicts outside of submodules
github-actions[bot] Jul 5, 2024
6398b7b
chore: empty commit bump
yamilmedina Jul 8, 2024
5c727cd
chore: update baseline
yamilmedina Jul 8, 2024
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
9,352 changes: 4,676 additions & 4,676 deletions app/lint-baseline.xml
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/wire/android/navigation/OtherDestinations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ interface IntentDirection : Direction {
fun intent(context: Context): Intent
}

object SupportScreenDestination : ExternalUriDirection {
override val uri: Uri
get() = Uri.parse(BuildConfig.URL_SUPPORT)
object SupportScreenDestination : ExternalUriStringResDirection {
override val uriStringRes: Int
get() = R.string.url_support
}

object PrivacyPolicyScreenDestination : ExternalUriStringResDirection {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ sealed class UIMessageContent {
class MLSWrongEpochWarning : SystemMessage(
iconResId = R.drawable.ic_info,
stringResId = R.string.label_system_message_conversation_mls_wrong_epoch_error_handled,
learnMoreResId = R.string.label_system_message_learn_more_about_mls_link
learnMoreResId = R.string.url_system_message_learn_more_about_mls
)

data class ConversationProtocolChanged(
Expand All @@ -509,7 +509,7 @@ sealed class UIMessageContent {
learnMoreResId = when (protocol) {
Conversation.Protocol.PROTEUS -> null
Conversation.Protocol.MIXED -> null
Conversation.Protocol.MLS -> R.string.label_system_message_learn_more_about_mls_link
Conversation.Protocol.MLS -> R.string.url_system_message_learn_more_about_mls
}
)

Expand Down
6 changes: 2 additions & 4 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/search/EmptySearchQueryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.tooling.preview.Preview
import com.wire.android.BuildConfig
import com.wire.android.R
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.theme.wireColorScheme
Expand All @@ -64,20 +63,19 @@ fun EmptySearchQueryScreen() {
textAlign = TextAlign.Center
)
Spacer(modifier = Modifier.height(dimensions().spacing16x))
val aboutSearchUrl = stringResource(id = R.string.url_learn_about_search)
Text(
text = stringResource(R.string.label_learn_more_searching_user),
style = MaterialTheme.wireTypography.body02.copy(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary
),
modifier = Modifier.clickable { CustomTabsHelper.launchUrl(context, LEARN_ABOUT_SEARCH_URL) }
modifier = Modifier.clickable { CustomTabsHelper.launchUrl(context, aboutSearchUrl) }
)
}
}
}

private const val LEARN_ABOUT_SEARCH_URL = "${BuildConfig.URL_SUPPORT}/hc/en-us/articles/203121850-How-can-I-find-someone"

@Preview
@Composable
fun EmptySearchQueryScreenPreview() {
Expand Down
7 changes: 2 additions & 5 deletions ...re/android/ui/home/conversations/search/messages/SearchConversationMessagesEmptyScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import com.wire.android.BuildConfig
import com.wire.android.R
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.theme.WireTheme
Expand All @@ -60,6 +59,7 @@ fun SearchConversationMessagesEmptyScreen() {
textAlign = TextAlign.Center
)
Spacer(modifier = Modifier.height(dimensions().spacing8x))
val searchUrl = stringResource(id = R.string.url_learn_about_conversation_search)
Text(
text = stringResource(R.string.label_learn_more),
style = MaterialTheme.wireTypography.body02.copy(
Expand All @@ -69,17 +69,14 @@ fun SearchConversationMessagesEmptyScreen() {
modifier = Modifier.clickable {
CustomTabsHelper.launchUrl(
context,
LEARN_ABOUT_SEARCH_URL
searchUrl
)
}
)
}
}
}

private const val LEARN_ABOUT_SEARCH_URL =
"${BuildConfig.URL_SUPPORT}/hc/en-us/articles/115001426529-Search-in-a-conversation"

@PreviewMultipleThemes
@Composable
fun previewSearchConversationMessagesEmptyScreen() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ fun FileSharingRestrictedContent(
modifier: Modifier = Modifier
) {
val context = LocalContext.current
val learnMoreUrl = stringResource(R.string.file_sharing_restricted_learn_more_link)
val learnMoreUrl = stringResource(R.string.url_file_sharing_restricted_learn_more)

Column(
horizontalAlignment = Alignment.CenterHorizontally,
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import com.wire.android.BuildConfig
import com.wire.android.R
import com.wire.android.ui.authentication.devices.DeviceItem
import com.wire.android.ui.authentication.devices.model.Device
Expand Down Expand Up @@ -87,7 +86,7 @@ private fun OtherUserDevicesContent(
onDeviceClick: (Device) -> Unit
) {
val context = LocalContext.current
val supportUrl = BuildConfig.URL_SUPPORT + stringResource(id = R.string.url_why_verify_conversation)
val supportUrl = stringResource(id = R.string.url_why_verify_conversation)
with(state) {
LazyColumn(
state = lazyListState,
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-af/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@
<string name="label_system_message_conversation_protocol_changed_during_a_call">Due to migration to MLS, you might have issues with your current call. If that\'s the case, hang up and call again.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Migration of encryption protocol has started. Make sure you all your Wire clients are updated.</string>
<string name="label_system_message_conversation_protocol_changed_mls">This conversation now uses the new Messaging Layer Security (MLS) protocol. To communicate seamlessly, always use the latest version of Wire on your devices.</string>
<string name="label_system_message_learn_more_about_mls_link">https://support.wire.com/hc/en-us/articles/12434725011485-Messaging-Layer-Security-MLS-</string>
<string name="label_system_message_receipt_mode_on">on</string>
<string name="label_system_message_receipt_mode_off">off</string>
<string name="label_system_message_conversation_started_by_self">**You** started the conversation</string>
Expand Down Expand Up @@ -932,7 +931,6 @@
<string name="block_user_dialog_confirm_button">Block</string>
<string name="other_user_devices_description">Wire gives every device a unique fingerprint. Compare them with %1$s and verify your conversation.</string>
<!--Settings -->
<string name="url_why_verify_conversation">/hc/en-us/articles/207859815</string>
<string name="settings_general_label">General</string>
<string name="settings_account_settings_label">Account Settings</string>
<string name="settings_devices_label">Devices</string>
Expand Down Expand Up @@ -1130,7 +1128,6 @@ In group conversations, the group admin can overwrite this setting.</string>
<string name="label_system_message_session_reset">%1$s was unable to decrypt some of your messages but has solved the issue. This affected all conversations you share together.</string>
<string name="label_manual_migration_title">Migrate from version 3.82.38</string>
<string name="start_manual_migration">Start</string>
<string name="file_sharing_restricted_learn_more_link">https://support.wire.com/hc/en-us/articles/4406404582673-How-can-I-restrict-file-sharing-for-my-team-</string>
<string name="file_sharing_restricted_description_by_team">You can not share this file because this feature is disabled for this account.</string>
<string name="file_sharing_restricted_description_no_users">You need to be logged in to Wire before you can share anything</string>
<string name="file_sharing_restricted_button_text_no_users">Open Wire</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,6 @@
<string name="label_system_message_conversation_protocol_changed_during_a_call">Due to migration to MLS, you might have issues with your current call. If that\'s the case, hang up and call again.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Migration of encryption protocol has started. Make sure you all your Wire clients are updated.</string>
<string name="label_system_message_conversation_protocol_changed_mls">This conversation now uses the new Messaging Layer Security (MLS) protocol. To communicate seamlessly, always use the latest version of Wire on your devices.</string>
<string name="label_system_message_learn_more_about_mls_link">https://support.wire.com/hc/en-us/articles/12434725011485-Messaging-Layer-Security-MLS-</string>
<string name="label_system_message_receipt_mode_on">on</string>
<string name="label_system_message_receipt_mode_off">off</string>
<string name="label_system_message_conversation_started_by_self">**You** started the conversation</string>
Expand Down Expand Up @@ -1004,7 +1003,6 @@
<string name="block_user_dialog_confirm_button">Block</string>
<string name="other_user_devices_description">Wire gives every device a unique fingerprint. Compare them with %1$s and verify your conversation.</string>
<!--Settings -->
<string name="url_why_verify_conversation">/hc/en-us/articles/207859815</string>
<string name="settings_general_label">General</string>
<string name="settings_account_settings_label">Account Settings</string>
<string name="settings_devices_label">Devices</string>
Expand Down Expand Up @@ -1210,7 +1208,6 @@ In group conversations, the group admin can overwrite this setting.</string>
<string name="label_system_message_session_reset">%1$s was unable to decrypt some of your messages but has solved the issue. This affected all conversations you share together.</string>
<string name="label_manual_migration_title">Migrate from version 3.82.38</string>
<string name="start_manual_migration">Start</string>
<string name="file_sharing_restricted_learn_more_link">https://support.wire.com/hc/en-us/articles/4406404582673-How-can-I-restrict-file-sharing-for-my-team-</string>
<string name="file_sharing_restricted_description_by_team">You can not share this file because this feature is disabled for this account.</string>
<string name="file_sharing_restricted_description_no_users">You need to be logged in to Wire before you can share anything</string>
<string name="file_sharing_restricted_button_text_no_users">Open Wire</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-bn/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@
<string name="label_system_message_conversation_protocol_changed_during_a_call">Due to migration to MLS, you might have issues with your current call. If that\'s the case, hang up and call again.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Migration of encryption protocol has started. Make sure you all your Wire clients are updated.</string>
<string name="label_system_message_conversation_protocol_changed_mls">This conversation now uses the new Messaging Layer Security (MLS) protocol. To communicate seamlessly, always use the latest version of Wire on your devices.</string>
<string name="label_system_message_learn_more_about_mls_link">https://support.wire.com/hc/en-us/articles/12434725011485-Messaging-Layer-Security-MLS-</string>
<string name="label_system_message_receipt_mode_on">on</string>
<string name="label_system_message_receipt_mode_off">off</string>
<string name="label_system_message_conversation_started_by_self">**You** started the conversation</string>
Expand Down Expand Up @@ -932,7 +931,6 @@
<string name="block_user_dialog_confirm_button">Block</string>
<string name="other_user_devices_description">Wire gives every device a unique fingerprint. Compare them with %1$s and verify your conversation.</string>
<!--Settings -->
<string name="url_why_verify_conversation">/hc/en-us/articles/207859815</string>
<string name="settings_general_label">General</string>
<string name="settings_account_settings_label">Account Settings</string>
<string name="settings_devices_label">Devices</string>
Expand Down Expand Up @@ -1130,7 +1128,6 @@ In group conversations, the group admin can overwrite this setting.</string>
<string name="label_system_message_session_reset">%1$s was unable to decrypt some of your messages but has solved the issue. This affected all conversations you share together.</string>
<string name="label_manual_migration_title">Migrate from version 3.82.38</string>
<string name="start_manual_migration">Start</string>
<string name="file_sharing_restricted_learn_more_link">https://support.wire.com/hc/en-us/articles/4406404582673-How-can-I-restrict-file-sharing-for-my-team-</string>
<string name="file_sharing_restricted_description_by_team">You can not share this file because this feature is disabled for this account.</string>
<string name="file_sharing_restricted_description_no_users">You need to be logged in to Wire before you can share anything</string>
<string name="file_sharing_restricted_button_text_no_users">Open Wire</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-ca/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@
<string name="label_system_message_conversation_protocol_changed_during_a_call">Due to migration to MLS, you might have issues with your current call. If that\'s the case, hang up and call again.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Migration of encryption protocol has started. Make sure you all your Wire clients are updated.</string>
<string name="label_system_message_conversation_protocol_changed_mls">This conversation now uses the new Messaging Layer Security (MLS) protocol. To communicate seamlessly, always use the latest version of Wire on your devices.</string>
<string name="label_system_message_learn_more_about_mls_link">https://support.wire.com/hc/en-us/articles/12434725011485-Messaging-Layer-Security-MLS-</string>
<string name="label_system_message_receipt_mode_on">on</string>
<string name="label_system_message_receipt_mode_off">off</string>
<string name="label_system_message_conversation_started_by_self">**You** started the conversation</string>
Expand Down Expand Up @@ -932,7 +931,6 @@
<string name="block_user_dialog_confirm_button">Block</string>
<string name="other_user_devices_description">Wire gives every device a unique fingerprint. Compare them with %1$s and verify your conversation.</string>
<!--Settings -->
<string name="url_why_verify_conversation">/hc/en-us/articles/207859815</string>
<string name="settings_general_label">General</string>
<string name="settings_account_settings_label">Account Settings</string>
<string name="settings_devices_label">Devices</string>
Expand Down Expand Up @@ -1130,7 +1128,6 @@ In group conversations, the group admin can overwrite this setting.</string>
<string name="label_system_message_session_reset">%1$s was unable to decrypt some of your messages but has solved the issue. This affected all conversations you share together.</string>
<string name="label_manual_migration_title">Migrate from version 3.82.38</string>
<string name="start_manual_migration">Start</string>
<string name="file_sharing_restricted_learn_more_link">https://support.wire.com/hc/en-us/articles/4406404582673-How-can-I-restrict-file-sharing-for-my-team-</string>
<string name="file_sharing_restricted_description_by_team">You can not share this file because this feature is disabled for this account.</string>
<string name="file_sharing_restricted_description_no_users">You need to be logged in to Wire before you can share anything</string>
<string name="file_sharing_restricted_button_text_no_users">Open Wire</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,6 @@
<string name="label_system_message_conversation_protocol_changed_during_a_call">Due to migration to MLS, you might have issues with your current call. If that\'s the case, hang up and call again.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Migration of encryption protocol has started. Make sure you all your Wire clients are updated.</string>
<string name="label_system_message_conversation_protocol_changed_mls">This conversation now uses the new Messaging Layer Security (MLS) protocol. To communicate seamlessly, always use the latest version of Wire on your devices.</string>
<string name="label_system_message_learn_more_about_mls_link">https://support.wire.com/hc/en-us/articles/12434725011485-Messaging-Layer-Security-MLS-</string>
<string name="label_system_message_receipt_mode_on">on</string>
<string name="label_system_message_receipt_mode_off">off</string>
<string name="label_system_message_conversation_started_by_self">**You** started the conversation</string>
Expand Down Expand Up @@ -968,7 +967,6 @@
<string name="block_user_dialog_confirm_button">Block</string>
<string name="other_user_devices_description">Wire gives every device a unique fingerprint. Compare them with %1$s and verify your conversation.</string>
<!--Settings -->
<string name="url_why_verify_conversation">/hc/en-us/articles/207859815</string>
<string name="settings_general_label">General</string>
<string name="settings_account_settings_label">Account Settings</string>
<string name="settings_devices_label">Devices</string>
Expand Down Expand Up @@ -1170,7 +1168,6 @@ In group conversations, the group admin can overwrite this setting.</string>
<string name="label_system_message_session_reset">%1$s was unable to decrypt some of your messages but has solved the issue. This affected all conversations you share together.</string>
<string name="label_manual_migration_title">Migrate from version 3.82.38</string>
<string name="start_manual_migration">Start</string>
<string name="file_sharing_restricted_learn_more_link">https://support.wire.com/hc/en-us/articles/4406404582673-How-can-I-restrict-file-sharing-for-my-team-</string>
<string name="file_sharing_restricted_description_by_team">You can not share this file because this feature is disabled for this account.</string>
<string name="file_sharing_restricted_description_no_users">You need to be logged in to Wire before you can share anything</string>
<string name="file_sharing_restricted_button_text_no_users">Open Wire</string>
Expand Down
Loading
Loading