Skip to content

Commit 2a02246

Browse files
authored
Merge pull request #874 from nextcloud/ecosystem-manager-change-error-messages
ecosystem manager change error message
2 parents d22c6e7 + 2e2cdae commit 2a02246

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

core/src/main/java/com/nextcloud/android/common/core/utils/ecosystem/EcosystemManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,14 @@ class EcosystemManager(
167167

168168
if (intent == null) {
169169
Log.d(TAG, "received intent is null")
170-
val message = activity.getString(R.string.ecosystem_null_intent)
170+
val message = activity.getString(R.string.ecosystem_wrong_intent)
171171
callback.onAccountError(message)
172172
return
173173
}
174174

175175
if (intent.action != ECOSYSTEM_INTENT_ACTION) {
176176
Log.d(TAG, "received intent action is not matching")
177-
val message = activity.getString(R.string.ecosystem_received_intent_action_not_matching)
177+
val message = activity.getString(R.string.ecosystem_wrong_intent)
178178
callback.onAccountError(message)
179179
return
180180
}

core/src/main/res/values/strings.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
<item quantity="other">%dh</item>
1717
</plurals>
1818

19-
2019
<string name="ecosystem_null_account">Account is missing. Cannot open the app.</string>
21-
<string name="ecosystem_null_intent">Received intent is null.</string>
22-
<string name="ecosystem_received_intent_action_not_matching">Received intent is not matching.</string>
20+
<string name="ecosystem_wrong_intent">Cannot complete action: received unexpected data</string>
2321
<string name="ecosystem_received_account_invalid">Received account is invalid.</string>
2422
<string name="ecosystem_invalid_account">Invalid account format. Must be an email.</string>
2523
<string name="ecosystem_app_not_found">App not installed. Redirecting to store…</string>

0 commit comments

Comments
 (0)