diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index 4553034de..4401e6796 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -244,8 +244,10 @@ public class AccountVerificationController extends BaseController { fetchProfile(credentials); } else { if (getActivity() != null && getResources() != null) { - getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString( - R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name)))); + getActivity().runOnUiThread(() -> progressText.setText( + String.format( + getResources().getString(R.string.nc_nextcloud_talk_app_not_installed), + getResources().getString(R.string.nc_app_product_name)))); } ApplicationWideMessageHolder.getInstance().setMessageType( @@ -258,8 +260,10 @@ public class AccountVerificationController extends BaseController { @Override public void onError(Throwable e) { if (getActivity() != null && getResources() != null) { - getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString( - R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name)))); + getActivity().runOnUiThread(() -> progressText.setText( + String.format( + getResources().getString(R.string.nc_nextcloud_talk_app_not_installed), + getResources().getString(R.string.nc_app_product_name)))); } ApplicationWideMessageHolder.getInstance().setMessageType( 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 70b85af44..b100793f8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -2344,7 +2344,7 @@ public class CallController extends BaseController { } private String getDescriptionForCallType() { - String appName = getResources().getString(R.string.nc_app_name); + String appName = getResources().getString(R.string.nc_app_product_name); if (isVoiceOnlyCall) { return String.format(getResources().getString(R.string.nc_call_voice), appName); } else { 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 3f3530af2..baa3a5d04 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -284,11 +284,13 @@ public class CallNotificationController extends BaseController { "conversation-call-flags"); if (hasCallFlags) { if (isInCallWithVideo(currentConversation.callFlag)) { - incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_video), - getResources().getString(R.string.nc_app_name))); + incomingCallVoiceOrVideoTextView.setText( + String.format(getResources().getString(R.string.nc_call_video), + getResources().getString(R.string.nc_app_product_name))); } else { - incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_voice), - getResources().getString(R.string.nc_app_name))); + incomingCallVoiceOrVideoTextView.setText( + String.format(getResources().getString(R.string.nc_call_voice), + getResources().getString(R.string.nc_app_product_name))); } } } @@ -328,8 +330,9 @@ public class CallNotificationController extends BaseController { super.onViewBound(view); String callDescriptionWithoutTypeInfo = - String.format(getResources().getString(R.string.nc_call_unknown), getResources().getString(R.string.nc_app_name)); - + String.format( + getResources().getString(R.string.nc_call_unknown), + getResources().getString(R.string.nc_app_product_name)); incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index fa734e885..189525091 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -2145,7 +2145,10 @@ class ChatController(args: Bundle) : R.id.action_copy_message -> { val clipboardManager = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager - val clipData = ClipData.newPlainText(resources?.getString(R.string.nc_app_name), message?.text) + val clipData = ClipData.newPlainText( + resources?.getString(R.string.nc_app_product_name), + message?.text + ) clipboardManager.setPrimaryClip(clipData) true } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 83fc55359..925d3791f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -815,7 +815,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ } else if (isNewConversationView) { return getResources().getString(R.string.nc_select_participants); } else { - return getResources().getString(R.string.nc_app_name); + return getResources().getString(R.string.nc_app_product_name); } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index d428ab62a..f7899097a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -737,7 +737,7 @@ public class ConversationsListController extends BaseController implements Searc @Override protected String getTitle() { - return getResources().getString(R.string.nc_app_name); + return getResources().getString(R.string.nc_app_product_name); } @Override diff --git a/app/src/main/java/com/nextcloud/talk/controllers/LockedController.kt b/app/src/main/java/com/nextcloud/talk/controllers/LockedController.kt index c4a7e0356..7744da6fa 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/LockedController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/LockedController.kt @@ -99,7 +99,7 @@ class LockedController : NewBaseController(R.layout.controller_locked) { .setTitle( String.format( context.getString(R.string.nc_biometric_unlock), - context.getString(R.string.nc_app_name) + context.getString(R.string.nc_app_product_name) ) ) .setNegativeButtonText(context.getString(R.string.nc_cancel)) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java index 9974b0fb6..7585184a0 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java @@ -265,7 +265,7 @@ public class ServerSelectionController extends BaseController { } else if (!status.getVersion().startsWith("13.")) { setErrorText(String.format(getResources(). getString(R.string.nc_server_version), - getResources().getString(R.string.nc_app_name), + getResources().getString(R.string.nc_app_product_name), productName)); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 3dfa341ea..f7ce60575 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -276,7 +276,7 @@ public class SettingsController extends BaseController { } else { screenLockSwitchPreference.setSummary(String.format(Locale.getDefault(), getResources().getString(R.string.nc_settings_screen_lock_desc), - getResources().getString(R.string.nc_app_name))); + getResources().getString(R.string.nc_app_product_name))); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java index c6fc63550..6633a208a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java @@ -149,7 +149,7 @@ public class WebViewLoginController extends BaseController { private String getWebLoginUserAgent() { return Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) + Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) + " " + Build.MODEL + " (" - + getResources().getString(R.string.nc_app_name) + ")"; + + getResources().getString(R.string.nc_app_product_name) + ")"; } @Override diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java index 7b9ed699e..52c77b5ee 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java @@ -260,6 +260,6 @@ public abstract class BaseController extends ButterKnifeController { } public String getSearchHint() { - return context.getString(R.string.appbar_search_in, context.getString(R.string.nc_app_name)); + return context.getString(R.string.appbar_search_in, context.getString(R.string.nc_app_product_name)); } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt index 7771cb4cb..1fc6ab406 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt @@ -300,7 +300,7 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? = open val appBarLayoutType: AppBarLayoutType get() = AppBarLayoutType.TOOLBAR val searchHint: String - get() = context!!.getString(R.string.appbar_search_in, context!!.getString(R.string.nc_app_name)) + get() = context!!.getString(R.string.appbar_search_in, context!!.getString(R.string.nc_app_product_name)) companion object { private val TAG = BaseController::class.java.simpleName diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java index 3dcba6705..a4f30050a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java @@ -133,7 +133,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte shareIntent = new Intent(Intent.ACTION_SEND); shareIntent.setType("text/plain"); shareIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(getResources().getString(R.string.nc_share_subject), - getResources().getString(R.string.nc_app_name))); + getResources().getString(R.string.nc_app_product_name))); } private void prepareMenu() { diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java index 3ff5643a5..f4a308c9b 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java @@ -44,7 +44,7 @@ public class DatabaseModule { @Singleton public SqlCipherDatabaseSource provideSqlCipherDatabaseSource(@NonNull final Context context) { return new SqlCipherDatabaseSource(context, Models.DEFAULT, - context.getResources().getString(R.string.nc_app_name).toLowerCase() + context.getResources().getString(R.string.nc_app_product_name).toLowerCase() .replace(" ", "_").trim() + ".sqlite", context.getString(R.string.nc_talk_database_encryption_key), 6); } diff --git a/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt index d28020b89..4864a8ae6 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt @@ -79,7 +79,7 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar val currentUser = userUtils.currentUser - accountName = context.getString(R.string.nc_app_name) + accountName = context.getString(R.string.nc_app_product_name) accountType = BuildConfig.APPLICATION_ID if (currentUser == null) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e5171a4ad..c7fd4d565 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -141,7 +141,7 @@ app:navigationIconTint="@color/fontAppbar" app:popupTheme="@style/appActionBarPopupMenu" app:titleTextColor="@color/fontAppbar" - tools:title="@string/nc_app_name"> + tools:title="@string/nc_app_product_name"> diff --git a/app/src/main/res/layout/controller_locked.xml b/app/src/main/res/layout/controller_locked.xml index 414c89f0f..9901d5520 100644 --- a/app/src/main/res/layout/controller_locked.xml +++ b/app/src/main/res/layout/controller_locked.xml @@ -39,7 +39,7 @@ android:id="@+id/appLogo" android:layout_width="match_parent" android:layout_height="wrap_content" - android:contentDescription="@string/nc_app_name" + android:contentDescription="@string/nc_app_product_name" android:src="@drawable/ic_logo" /> diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml index 1411f010f..4dddab404 100644 --- a/app/src/main/res/layout/controller_settings.xml +++ b/app/src/main/res/layout/controller_settings.xml @@ -368,7 +368,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" apc:mp_summary="v0.1" - apc:mp_title="@string/nc_app_name" /> + apc:mp_title="@string/nc_app_product_name" /> diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml index 2435ca1bf..a4c9ed908 100644 --- a/app/src/main/res/values/setup.xml +++ b/app/src/main/res/values/setup.xml @@ -25,7 +25,8 @@ nc false - Nextcloud Talk + Talk + Nextcloud Talk Nextcloud https://push-notifications.nextcloud.com diff --git a/app/src/main/res/xml/auth.xml b/app/src/main/res/xml/auth.xml index 68043dfd0..3078c74d0 100644 --- a/app/src/main/res/xml/auth.xml +++ b/app/src/main/res/xml/auth.xml @@ -23,4 +23,4 @@ android:accountType="com.nextcloud.talk2" android:icon="@mipmap/ic_launcher" android:smallIcon="@mipmap/ic_launcher" - android:label="@string/nc_app_name"/> + android:label="@string/nc_app_product_name"/> diff --git a/app/src/qa/res/values/setup.xml b/app/src/qa/res/values/setup.xml index 0650249ab..4367c61b6 100644 --- a/app/src/qa/res/values/setup.xml +++ b/app/src/qa/res/values/setup.xml @@ -20,6 +20,7 @@ --> - Nextcloud Talk QA + Talk QA + Nextcloud Talk QA Nextcloud