diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index 116f98073..6348f3df3 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -2174,7 +2174,7 @@ public class CallController extends BaseController { } callConversationNameTextView.setText(conversationName); - callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); + callVoiceOrVideoTextView.setText(getDescriptionForCallType()); if (callStateView.getVisibility() != View.VISIBLE) { callStateView.setVisibility(View.VISIBLE); @@ -2197,7 +2197,7 @@ public class CallController extends BaseController { handler.post(() -> { hangup(false); callStateTextView.setText(R.string.nc_call_timeout); - callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); + callVoiceOrVideoTextView.setText(getDescriptionForCallType()); if (callStateView.getVisibility() != View.VISIBLE) { callStateView.setVisibility(View.VISIBLE); } @@ -2221,7 +2221,7 @@ public class CallController extends BaseController { handler.post(() -> { playCallingSound(); callStateTextView.setText(R.string.nc_call_reconnecting); - callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); + callVoiceOrVideoTextView.setText(getDescriptionForCallType()); if (callStateView.getVisibility() != View.VISIBLE) { callStateView.setVisibility(View.VISIBLE); } @@ -2240,7 +2240,7 @@ public class CallController extends BaseController { case JOINED: handler.postDelayed(() -> setCallState(CallStatus.CALLING_TIMEOUT), 45000); handler.post(() -> { - callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); + callVoiceOrVideoTextView.setText(getDescriptionForCallType()); if (callStateView != null) { if (isIncomingCallFromNotification) { callStateTextView.setText(R.string.nc_call_incoming); @@ -2274,7 +2274,7 @@ public class CallController extends BaseController { case IN_CONVERSATION: handler.post(() -> { stopCallingSound(); - callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); + callVoiceOrVideoTextView.setText(getDescriptionForCallType()); if (!isVoiceOnlyCall) { callInfosLinearLayout.setVisibility(View.GONE); @@ -2346,7 +2346,7 @@ public class CallController extends BaseController { handler.post(() -> { if (!isDestroyed() && !isBeingDestroyed()) { stopCallingSound(); - callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); + callVoiceOrVideoTextView.setText(getDescriptionForCallType()); callStateTextView.setText(R.string.nc_leaving_call); callStateView.setVisibility(View.VISIBLE); remoteRenderersLayout.setVisibility(View.INVISIBLE); @@ -2360,6 +2360,17 @@ public class CallController extends BaseController { } } + private String getDescriptionForCallType() { + String appName = getResources().getString(R.string.nc_app_name); + if (isVoiceOnlyCall){ + return String.format(getResources().getString(R.string.nc_call_voice), + getResources().getString(R.string.nc_app_name)); + } else { + return String.format(getResources().getString(R.string.nc_call_video), + getResources().getString(R.string.nc_app_name)); + } + } + private void playCallingSound() { stopCallingSound(); Uri ringtoneUri; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 879c0ce51..7fbb99d02 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -280,9 +280,11 @@ public class CallNotificationController extends BaseController { boolean hasCallFlags = userBeingCalled.hasSpreedFeatureCapability("conversation-call-flags"); if (hasCallFlags) { if (isInCallWithVideo(currentConversation.callFlag)){ - incomingCallVoiceOrVideoTextView.setText(R.string.nc_video_call); + incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_video), + getResources().getString(R.string.nc_app_name))); } else { - incomingCallVoiceOrVideoTextView.setText(R.string.nc_voice_call); + incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_voice), + getResources().getString(R.string.nc_app_name))); } } } @@ -343,11 +345,17 @@ public class CallNotificationController extends BaseController { showAnswerControls(); } - @SuppressLint("LongLogTag") + @SuppressLint({"LongLogTag"}) @Override protected void onViewBound(@NonNull View view) { super.onViewBound(view); + String callDescriptionWithoutTypeInfo = + String.format(getResources().getString(R.string.nc_call_unknown), getResources().getString(R.string.nc_app_name)); + + + incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo); + renderScript = RenderScript.create(getActivity()); if (handler == null) { @@ -395,7 +403,6 @@ public class CallNotificationController extends BaseController { protected void onAttach(@NonNull View view) { super.onAttach(view); eventBus.register(this); - } private void loadAvatar() { diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml index 4ed9351c9..ff9ac440a 100644 --- a/app/src/main/res/layout/controller_call_notification.xml +++ b/app/src/main/res/layout/controller_call_notification.xml @@ -81,7 +81,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="@string/nc_unknown_call" + android:text="@string/nc_call_unknown" android:textAlignment="center" android:textColor="@color/controller_call_incomingCallTextView" android:textSize="16sp" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0228a95f1..68066ecfa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,9 +188,9 @@ Open settings - Nextcloud Talk voice call - Nextcloud Talk video call - Nextcloud Talk call + %s voice call + %s video call + %s call INCOMING RINGING Connecting…