Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt error name to a less generic error name, but still more generic than explicitly telling the server is down (this commit message is longer than the actual changes in the files)

Browse Source
This commit is contained in:
fgerber 2023-01-07 12:13:21 +01:00 committed by Matthieu
parent 1aa9f7bca2
commit 09f272eb3c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/pixeldroid/app/posts/feeds/CommonFeedFragmentUtils.kt
View File

@ -86,7 +86,7 @@ internal fun <T: Any> initAdapter(
Gson().fromJson(s, org.pixeldroid.app.utils.api.objects.Error::class.java)?.error?.ifBlank { null }
} catch (exception: Exception) {
errorLayout.root.context.getString(
R.string.unknown_error,
R.string.unknown_error_in_error,
it.error.localizedMessage.orEmpty()
)
}

2
app/src/main/res/values/strings.xml
View File

@ -123,7 +123,7 @@ For more info about Pixelfed, you can check here: https://pixelfed.org"</string>
<!-- Loading error messages -->
<string name="loading_toast">Something went wrong while loading</string>
<string name="feed_failed">Could not get feed</string>
<string name="unknown_error">Unknown error, check if server is down: %1$s</string>
<string name="unknown_error_in_error">Unknown error, check if server is down: %1$s</string>
<!-- Post pop-up options -->
<string name="share_picture">Share picture…</string>
<string name="save_to_gallery">Save to Gallery…</string>