diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java index 1453962f38..8ffd7102f9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java @@ -90,6 +90,7 @@ public class ManageRecipientFragment extends Fragment { private TextView groupsInCommonCount; private View messageButton; private View secureCallButton; + private View insecureCallButton; private View secureVideoCallButton; static ManageRecipientFragment newInstance(@NonNull RecipientId recipientId) { @@ -138,6 +139,7 @@ public class ManageRecipientFragment extends Fragment { toggleAllGroups = view.findViewById(R.id.toggle_all_groups); messageButton = view.findViewById(R.id.recipient_message); secureCallButton = view.findViewById(R.id.recipient_voice_call); + insecureCallButton = view.findViewById(R.id.recipient_insecure_voice_call); secureVideoCallButton = view.findViewById(R.id.recipient_video_call); return view; @@ -228,6 +230,7 @@ public class ManageRecipientFragment extends Fragment { messageButton.setOnClickListener(v -> viewModel.onMessage(requireActivity())); secureCallButton.setOnClickListener(v -> viewModel.onSecureCall(requireActivity())); + insecureCallButton.setOnClickListener(v -> viewModel.onInsecureCall(requireActivity())); secureVideoCallButton.setOnClickListener(v -> viewModel.onSecureVideoCall(requireActivity())); } @@ -263,6 +266,7 @@ public class ManageRecipientFragment extends Fragment { colorRow.setOnClickListener(v -> handleColorSelection(color)); secureCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); + insecureCallButton.setVisibility(!recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); secureVideoCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java index cb52d86de0..404487f0eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java @@ -229,6 +229,10 @@ public final class ManageRecipientViewModel extends ViewModel { withRecipient(r -> CommunicationActions.startVoiceCall(activity, r)); } + void onInsecureCall(@NonNull FragmentActivity activity) { + withRecipient(r -> CommunicationActions.startInsecureCall(activity, r)); + } + void onSecureVideoCall(@NonNull FragmentActivity activity) { withRecipient(r -> CommunicationActions.startVideoCall(activity, r)); } diff --git a/app/src/main/res/drawable/ic_phone_right_unlock_outline_ultramarine_24.xml b/app/src/main/res/drawable/ic_phone_right_unlock_outline_ultramarine_24.xml new file mode 100644 index 0000000000..b7e9afb9fc --- /dev/null +++ b/app/src/main/res/drawable/ic_phone_right_unlock_outline_ultramarine_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_phone_right_unlock_solid_ultramarine_light_24.xml b/app/src/main/res/drawable/ic_phone_right_unlock_solid_ultramarine_light_24.xml new file mode 100644 index 0000000000..c1b7c66b02 --- /dev/null +++ b/app/src/main/res/drawable/ic_phone_right_unlock_solid_ultramarine_light_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/recipient_manage_fragment.xml b/app/src/main/res/layout/recipient_manage_fragment.xml index ab578a5686..de507cbe26 100644 --- a/app/src/main/res/layout/recipient_manage_fragment.xml +++ b/app/src/main/res/layout/recipient_manage_fragment.xml @@ -68,6 +68,16 @@ app:icon="?recipient_message_circle_icon" app:rippleColor="@color/core_ultramarine" /> + + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 5418fa656f..ba1a6ac861 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -303,6 +303,7 @@ + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b84bbcc79..57d7f16bbd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -560,6 +560,7 @@ Edit name and picture Message Voice call + Insecure voice call Video call diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 4e42f2c4cc..4792834527 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -440,6 +440,7 @@ @drawable/ic_message_outline_ultramarine_24 @drawable/ic_phone_right_outline_ultramarine_24 + @drawable/ic_phone_right_unlock_outline_ultramarine_24 @drawable/ic_video_outline_ultramarine_24 @color/core_grey_02 @@ -735,6 +736,7 @@ @drawable/ic_message_solid_ultramarine_light_24 @drawable/ic_phone_right_solid_ultramarine_light_24 + @drawable/ic_phone_right_unlock_solid_ultramarine_light_24 @drawable/ic_video_solid_ultramarine_light_24 @color/core_grey_80