diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java index e9e177aa54bd..e2a3650dbe9a 100644 --- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -1,7 +1,7 @@ /* * Nextcloud - Android Client * - * SPDX-FileCopyrightText: 2023-2024 TSI-mc + * SPDX-FileCopyrightText: 2023-2025 TSI-mc * SPDX-FileCopyrightText: 2019-2021 Tobias Kaminsky * SPDX-FileCopyrightText: 2018 Andy Scherzinger * SPDX-FileCopyrightText: 2017 Mario Danic @@ -1171,7 +1171,7 @@ public void onAuthenticatorTaskCallback(RemoteOperationResult result) if (accountSetupWebviewBinding != null) { anonymouslyPostLoginRequest(mServerInfo.mBaseUrl + WEB_LOGIN); } else { - DisplayUtils.showSnackMessage(this, R.string.auth_access_failed, result.getLogMessage()); + DisplayUtils.showSnackMessage(this, R.string.auth_access_failed, result.getLogMessage(this)); // init webView again updateAuthStatusIconAndText(result); diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java index c4627a3c07d2..e209aa21b51b 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -2,7 +2,7 @@ * Nextcloud - Android Client * * SPDX-FileCopyrightText: 2023 Alper Ozturk - * SPDX-FileCopyrightText: 2022 TSI-mc + * SPDX-FileCopyrightText: 2022-2025 TSI-mc * SPDX-FileCopyrightText: 2021 Chris Narkiewicz * SPDX-FileCopyrightText: 2018-2020 Tobias Kaminsky * SPDX-FileCopyrightText: 2018 Andy Scherzinger @@ -567,7 +567,7 @@ public OCFile saveFileWithParent(OCFile ocFile, Context context) { } else { Exception exception = result.getException(); String message = "Error during saving file with parents: " + ocFile.getRemotePath() + " / " - + result.getLogMessage(); + + result.getLogMessage(context); if (exception != null) { throw new RemoteOperationFailedException(message, exception); diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java index a28d142a555e..251d043855ce 100644 --- a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java +++ b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java @@ -3,6 +3,7 @@ * * SPDX-FileCopyrightText: 2019 Chris Narkiewicz * SPDX-FileCopyrightText: 2018 Edvard Holst + * SPDX-FileCopyrightText: 2025 TSI-mc * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package com.owncloud.android.ui.activities.data.activities; @@ -94,7 +95,7 @@ protected Boolean doInBackground(Void... voids) { } else { Log_OC.d(TAG, result.getLogMessage()); // show error - errorMessage = result.getLogMessage(); + errorMessage = result.getLogMessage(MainApp.getAppContext()); if (result.getHttpCode() == HttpStatus.SC_NOT_MODIFIED) { errorMessage = context.getString(R.string.file_list_empty_headline_server_search); } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt index 1840ca079c76..ada5a2da54f1 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz * SPDX-FileCopyrightText: 2017 Mario Danic * SPDX-FileCopyrightText: 2017 Nextcloud GmbH + * SPDX-FileCopyrightText: 2025 TSI-mc * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package com.owncloud.android.ui.activity @@ -259,7 +260,7 @@ class NotificationsActivity : AppCompatActivity(), NotificationsContract.View, I runOnUiThread { setEmptyContent( getString(R.string.notifications_no_results_headline), - result?.logMessage + result?.getLogMessage(this) ) } } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java index 8535be5187c4..e1cf782b39cb 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java @@ -7,6 +7,7 @@ * SPDX-FileCopyrightText: 2018 Tobias Kaminsky * SPDX-FileCopyrightText: 2017 Mario Danic * SPDX-FileCopyrightText: 2017 Nextcloud GmbH + * SPDX-FileCopyrightText: 2025 TSI-mc * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package com.owncloud.android.ui.activity; @@ -317,7 +318,7 @@ private void fetchAndSetData() { // show error runOnUiThread(() -> setErrorMessageForMultiList( getString(R.string.user_information_retrieval_error), - result.getLogMessage(), + result.getLogMessage(this), R.drawable.ic_list_empty_error) ); Log_OC.d(TAG, result.getLogMessage()); diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java index 9edd461fc875..79b2f3acb5b4 100644 --- a/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java +++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java @@ -3,6 +3,7 @@ * * SPDX-FileCopyrightText: 2019 Tobias Kaminsky * SPDX-FileCopyrightText: 2019 Nextcloud GmbH + * SPDX-FileCopyrightText: 2025 TSI-mc * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package com.owncloud.android.ui.asynctasks; @@ -10,6 +11,7 @@ import android.os.AsyncTask; import com.nextcloud.client.account.User; +import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -60,7 +62,7 @@ protected String doInBackground(Void... voids) { if (!result.isSuccess()) { Exception exception = result.getException(); - String message = "Fetching file " + remotePath + " fails with: " + result.getLogMessage(); + String message = "Fetching file " + remotePath + " fails with: " + result.getLogMessage(MainApp.getAppContext()); if (exception != null) { return exception.getMessage(); @@ -95,7 +97,7 @@ protected String doInBackground(Void... voids) { fileDisplayActivity.setFile(ocFile); } else { - return remoteOperationResult.getLogMessage(); + return remoteOperationResult.getLogMessage(MainApp.getAppContext()); } return ""; diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java index 68618877fa33..4b53078e5e9f 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java @@ -3,6 +3,7 @@ * * SPDX-FileCopyrightText: 2019 Chris Narkiewicz * SPDX-FileCopyrightText: 2018 Andy Scherzinger + * SPDX-FileCopyrightText: 2025 TSI-mc * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package com.owncloud.android.ui.fragment; @@ -331,7 +332,7 @@ private void fetchAndSetData(int lastGiven) { } else { Log_OC.d(TAG, result.getLogMessage()); // show error - String logMessage = result.getLogMessage(); + String logMessage = result.getLogMessage(requireContext()); if (result.getHttpCode() == HttpStatus.SC_NOT_MODIFIED) { logMessage = getString(R.string.activities_no_results_message); }