diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt b/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt index e5b364af8..60dcb0483 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt @@ -9,7 +9,6 @@ import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -45,15 +44,14 @@ fun CreateSimpleXAddress(m: ChatModel) { val connReqContact = m.controller.apiCreateUserAddress() if (connReqContact != null) { m.userAddress.value = UserContactLinkRec(connReqContact) -// TODO uncomment in v5.2 -// try { -// val u = m.controller.apiSetProfileAddress(true) -// if (u != null) { -// m.updateUser(u) -// } -// } catch (e: Exception) { -// Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}") -// } + try { + val u = m.controller.apiSetProfileAddress(true) + if (u != null) { + m.updateUser(u) + } + } catch (e: Exception) { + Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}") + } progressIndicator = false } } @@ -94,8 +92,7 @@ private fun CreateSimpleXAddressLayout( ContinueButton(nextStep) } else { CreateAddressButton(createAddress) -// TODO remove color in v5.2 - TextBelowButton(stringResource(R.string.your_contacts_will_see_it), color = Color.Transparent) + TextBelowButton(stringResource(R.string.your_contacts_will_see_it)) Spacer(Modifier.weight(1f)) SkipButton(nextStep) } @@ -144,8 +141,7 @@ private fun SkipButton(onClick: () -> Unit) { } @Composable -private fun TextBelowButton(text: String, color: Color = Color.Unspecified) { - // TODO remove color in v5.2 +private fun TextBelowButton(text: String) { Text( text, Modifier @@ -153,7 +149,6 @@ private fun TextBelowButton(text: String, color: Color = Color.Unspecified) { .padding(horizontal = DEFAULT_PADDING * 3), style = MaterialTheme.typography.subtitle1, textAlign = TextAlign.Center, - color = color ) } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt index 7d7646598..c9ce92f10 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt @@ -69,16 +69,15 @@ fun UserAddressView( if (connReqContact != null) { chatModel.userAddress.value = UserContactLinkRec(connReqContact) -// TODO uncomment in v5.2 -// AlertManager.shared.showAlertDialog( -// title = generalGetString(R.string.share_address_with_contacts_question), -// text = generalGetString(R.string.add_address_to_your_profile), -// confirmText = generalGetString(R.string.share_verb), -// onConfirm = { -// setProfileAddress(true) -// shareViaProfile.value = true -// } -// ) + AlertManager.shared.showAlertDialog( + title = generalGetString(R.string.share_address_with_contacts_question), + text = generalGetString(R.string.add_address_to_your_profile), + confirmText = generalGetString(R.string.share_verb), + onConfirm = { + setProfileAddress(true) + shareViaProfile.value = true + } + ) } progressIndicator = false } @@ -204,8 +203,7 @@ private fun UserAddressLayout( QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f)) ShareAddressButton { share(userAddress.connReqContact) } ShareViaEmailButton { sendEmail(userAddress) } -// TODO uncomment in v5.2 -// ShareWithContactsButton(shareViaProfile, setProfileAddress) + ShareWithContactsButton(shareViaProfile, setProfileAddress) AutoAcceptToggle(autoAcceptState) { saveAas(autoAcceptState.value, autoAcceptStateSaved) } LearnMoreButton(learnMore) } diff --git a/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift b/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift index 48acf7a79..049c4bee0 100644 --- a/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift +++ b/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift @@ -81,12 +81,11 @@ struct CreateSimpleXAddress: View { DispatchQueue.main.async { m.userAddress = UserContactLink(connReqContact: connReqContact) } -// TODO uncomment in v5.2 -// if let u = try await apiSetProfileAddress(on: true) { -// DispatchQueue.main.async { -// m.updateUser(u) -// } -// } + if let u = try await apiSetProfileAddress(on: true) { + DispatchQueue.main.async { + m.updateUser(u) + } + } await MainActor.run { progressIndicator = false } } catch let error { logger.error("CreateSimpleXAddress create address: \(responseError(error))") @@ -102,11 +101,9 @@ struct CreateSimpleXAddress: View { Text("Create SimpleX address").font(.title) } Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.") - // TODO remove in in v5.2 - .foregroundColor(.clear) - .multilineTextAlignment(.center) - .font(.footnote) - .padding(.horizontal, 32) + .multilineTextAlignment(.center) + .font(.footnote) + .padding(.horizontal, 32) } } diff --git a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift index 56cab6bc4..134eeb969 100644 --- a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift +++ b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift @@ -195,8 +195,7 @@ struct UserAddressView: View { if MFMailComposeViewController.canSendMail() { shareViaEmailButton(userAddress) } -// TODO uncomment in 5.2 -// shareWithContactsButton() + shareWithContactsButton() autoAcceptToggle() learnMoreButton() } header: { @@ -223,8 +222,7 @@ struct UserAddressView: View { let connReqContact = try await apiCreateUserAddress() DispatchQueue.main.async { chatModel.userAddress = UserContactLink(connReqContact: connReqContact) -// TODO uncomment in 5.2 -// alert = .shareOnCreate + alert = .shareOnCreate progressIndicator = false } } catch let error { diff --git a/src/Simplex/Chat/Help.hs b/src/Simplex/Chat/Help.hs index fa7dbafff..8997f150d 100644 --- a/src/Simplex/Chat/Help.hs +++ b/src/Simplex/Chat/Help.hs @@ -201,7 +201,7 @@ myAddressHelpInfo = styleMarkdown [ green "Your contact address commands:", indent <> highlight "/address " <> " - create your address", - -- indent <> highlight "/profile_address on/off " <> " - share address with your contacts (it will be added to your profile)", + indent <> highlight "/profile_address on/off " <> " - share address with your contacts (it will be added to your profile)", indent <> highlight "/delete_address " <> " - delete your address (accepted contacts will remain connected)", indent <> highlight "/show_address " <> " - show your address", indent <> highlight "/accept " <> " - accept contact request", diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs index 33c0276cc..1c3eeafe0 100644 --- a/src/Simplex/Chat/View.hs +++ b/src/Simplex/Chat/View.hs @@ -641,7 +641,7 @@ connReqContact_ intro cReq = "", "Anybody can send you contact requests with: " <> highlight' "/c ", "to show it again: " <> highlight' "/sa", - -- "to share with your contacts: " <> highlight' "/profile_address on", + "to share with your contacts: " <> highlight' "/profile_address on", "to delete it: " <> highlight' "/da" <> " (accepted contacts will remain connected)" ] diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs index ec7a87cfe..3c1e29a8d 100644 --- a/tests/ChatTests/Utils.hs +++ b/tests/ChatTests/Utils.hs @@ -358,7 +358,7 @@ getContactLink cc created = do cc <## "" cc <## "Anybody can send you contact requests with: /c " cc <## "to show it again: /sa" - -- cc <## "to share with your contacts: /profile_address on" + cc <## "to share with your contacts: /profile_address on" cc <## "to delete it: /da (accepted contacts will remain connected)" pure link