mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-30 08:50:44 +00:00
Merge remote-tracking branch 'upstream/main' into gallery2
This commit is contained in:
commit
b935f60fcb
24
.github/workflows/create-release.yml
vendored
24
.github/workflows/create-release.yml
vendored
@ -99,7 +99,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-universal-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
|
asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-x86-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk
|
asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -121,7 +121,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-x86_64-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
|
asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-arm64-v8a-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk
|
asset_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -143,7 +143,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-armeabi-v7a-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk
|
asset_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -155,7 +155,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-universal-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk
|
asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -166,7 +166,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-x86-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk
|
asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -177,7 +177,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-x86_64-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
|
asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -188,7 +188,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-arm64-v8a-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk
|
asset_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -199,7 +199,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned-signed.apk
|
asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-armeabi-v7a-release-unsigned-signed.apk
|
||||||
asset_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk
|
asset_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -213,7 +213,7 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/bundle/playRelease/app-play-release.aab
|
asset_path: amethyst/build/outputs/bundle/playRelease/amethyst-play-release.aab
|
||||||
asset_name: amethyst-googleplay-${{ github.ref_name }}.aab
|
asset_name: amethyst-googleplay-${{ github.ref_name }}.aab
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
|
||||||
@ -225,6 +225,6 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: amethyst/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
|
asset_path: amethyst/build/outputs/bundle/fdroidRelease/amethyst-fdroid-release.aab
|
||||||
asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
|
asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
|
||||||
asset_content_type: application/zip
|
asset_content_type: application/zip
|
||||||
|
@ -12,8 +12,8 @@ android {
|
|||||||
applicationId "com.vitorpamplona.amethyst"
|
applicationId "com.vitorpamplona.amethyst"
|
||||||
minSdk 26
|
minSdk 26
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 381
|
versionCode 382
|
||||||
versionName "0.88.4"
|
versionName "0.88.5"
|
||||||
buildConfigField "String", "RELEASE_NOTES_ID", "\"2a34cbadd03212c8162e1ff896ba12641821088a2ec8d5e40d54aa80c0510800\""
|
buildConfigField "String", "RELEASE_NOTES_ID", "\"2a34cbadd03212c8162e1ff896ba12641821088a2ec8d5e40d54aa80c0510800\""
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
@ -0,0 +1,63 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2024 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.amethyst.service
|
||||||
|
|
||||||
|
import com.vitorpamplona.amethyst.R
|
||||||
|
|
||||||
|
class HttpStatusMessages {
|
||||||
|
companion object {
|
||||||
|
fun resourceIdFor(statusCode: Int = 0): Int? =
|
||||||
|
when (statusCode) {
|
||||||
|
400 -> R.string.http_status_400
|
||||||
|
401 -> R.string.http_status_401
|
||||||
|
402 -> R.string.http_status_402
|
||||||
|
403 -> R.string.http_status_403
|
||||||
|
404 -> R.string.http_status_404
|
||||||
|
405 -> R.string.http_status_405
|
||||||
|
406 -> R.string.http_status_406
|
||||||
|
407 -> R.string.http_status_407
|
||||||
|
408 -> R.string.http_status_408
|
||||||
|
409 -> R.string.http_status_409
|
||||||
|
410 -> R.string.http_status_410
|
||||||
|
411 -> R.string.http_status_411
|
||||||
|
412 -> R.string.http_status_412
|
||||||
|
413 -> R.string.http_status_413
|
||||||
|
414 -> R.string.http_status_414
|
||||||
|
415 -> R.string.http_status_415
|
||||||
|
416 -> R.string.http_status_416
|
||||||
|
417 -> R.string.http_status_417
|
||||||
|
426 -> R.string.http_status_426
|
||||||
|
|
||||||
|
500 -> R.string.http_status_500
|
||||||
|
501 -> R.string.http_status_501
|
||||||
|
502 -> R.string.http_status_502
|
||||||
|
503 -> R.string.http_status_503
|
||||||
|
504 -> R.string.http_status_504
|
||||||
|
505 -> R.string.http_status_505
|
||||||
|
506 -> R.string.http_status_506
|
||||||
|
507 -> R.string.http_status_507
|
||||||
|
508 -> R.string.http_status_508
|
||||||
|
511 -> R.string.http_status_511
|
||||||
|
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -21,6 +21,7 @@
|
|||||||
package com.vitorpamplona.amethyst.service
|
package com.vitorpamplona.amethyst.service
|
||||||
|
|
||||||
import android.content.ContentResolver
|
import android.content.ContentResolver
|
||||||
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.OpenableColumns
|
import android.provider.OpenableColumns
|
||||||
import android.webkit.MimeTypeMap
|
import android.webkit.MimeTypeMap
|
||||||
@ -29,7 +30,9 @@ import com.fasterxml.jackson.annotation.JsonProperty
|
|||||||
import com.fasterxml.jackson.databind.DeserializationFeature
|
import com.fasterxml.jackson.databind.DeserializationFeature
|
||||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||||
import com.vitorpamplona.amethyst.BuildConfig
|
import com.vitorpamplona.amethyst.BuildConfig
|
||||||
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.model.Account
|
import com.vitorpamplona.amethyst.model.Account
|
||||||
|
import com.vitorpamplona.amethyst.ui.stringRes
|
||||||
import com.vitorpamplona.ammolite.service.HttpClientManager
|
import com.vitorpamplona.ammolite.service.HttpClientManager
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||||
@ -48,7 +51,9 @@ val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
|
|||||||
|
|
||||||
fun randomChars() = List(16) { charPool.random() }.joinToString("")
|
fun randomChars() = List(16) { charPool.random() }.joinToString("")
|
||||||
|
|
||||||
class Nip96Uploader(val account: Account?) {
|
class Nip96Uploader(
|
||||||
|
val account: Account?,
|
||||||
|
) {
|
||||||
suspend fun uploadImage(
|
suspend fun uploadImage(
|
||||||
uri: Uri,
|
uri: Uri,
|
||||||
contentType: String?,
|
contentType: String?,
|
||||||
@ -58,6 +63,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
server: Nip96MediaServers.ServerName,
|
server: Nip96MediaServers.ServerName,
|
||||||
contentResolver: ContentResolver,
|
contentResolver: ContentResolver,
|
||||||
onProgress: (percentage: Float) -> Unit,
|
onProgress: (percentage: Float) -> Unit,
|
||||||
|
context: Context,
|
||||||
): PartialEvent {
|
): PartialEvent {
|
||||||
val serverInfo =
|
val serverInfo =
|
||||||
Nip96Retriever()
|
Nip96Retriever()
|
||||||
@ -74,6 +80,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
serverInfo,
|
serverInfo,
|
||||||
contentResolver,
|
contentResolver,
|
||||||
onProgress,
|
onProgress,
|
||||||
|
context,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,6 +93,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
server: Nip96Retriever.ServerInfo,
|
server: Nip96Retriever.ServerInfo,
|
||||||
contentResolver: ContentResolver,
|
contentResolver: ContentResolver,
|
||||||
onProgress: (percentage: Float) -> Unit,
|
onProgress: (percentage: Float) -> Unit,
|
||||||
|
context: Context,
|
||||||
): PartialEvent {
|
): PartialEvent {
|
||||||
checkNotInMainThread()
|
checkNotInMainThread()
|
||||||
|
|
||||||
@ -111,6 +119,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
sensitiveContent,
|
sensitiveContent,
|
||||||
server,
|
server,
|
||||||
onProgress,
|
onProgress,
|
||||||
|
context,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -122,6 +131,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
sensitiveContent: String?,
|
sensitiveContent: String?,
|
||||||
server: Nip96Retriever.ServerInfo,
|
server: Nip96Retriever.ServerInfo,
|
||||||
onProgress: (percentage: Float) -> Unit,
|
onProgress: (percentage: Float) -> Unit,
|
||||||
|
context: Context,
|
||||||
): PartialEvent {
|
): PartialEvent {
|
||||||
checkNotInMainThread()
|
checkNotInMainThread()
|
||||||
|
|
||||||
@ -130,11 +140,11 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
|
contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
|
||||||
|
|
||||||
val client = HttpClientManager.getHttpClient()
|
val client = HttpClientManager.getHttpClient()
|
||||||
val requestBody: RequestBody
|
|
||||||
val requestBuilder = Request.Builder()
|
val requestBuilder = Request.Builder()
|
||||||
|
|
||||||
requestBody =
|
val requestBody: RequestBody =
|
||||||
MultipartBody.Builder()
|
MultipartBody
|
||||||
|
.Builder()
|
||||||
.setType(MultipartBody.FORM)
|
.setType(MultipartBody.FORM)
|
||||||
.addFormDataPart("expiration", "")
|
.addFormDataPart("expiration", "")
|
||||||
.addFormDataPart("size", length.toString())
|
.addFormDataPart("size", length.toString())
|
||||||
@ -142,8 +152,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
alt?.let { body.addFormDataPart("alt", it) }
|
alt?.let { body.addFormDataPart("alt", it) }
|
||||||
sensitiveContent?.let { body.addFormDataPart("content-warning", it) }
|
sensitiveContent?.let { body.addFormDataPart("content-warning", it) }
|
||||||
contentType?.let { body.addFormDataPart("content_type", it) }
|
contentType?.let { body.addFormDataPart("content_type", it) }
|
||||||
}
|
}.addFormDataPart(
|
||||||
.addFormDataPart(
|
|
||||||
"file",
|
"file",
|
||||||
"$fileName.$extension",
|
"$fileName.$extension",
|
||||||
object : RequestBody() {
|
object : RequestBody() {
|
||||||
@ -155,8 +164,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
inputStream.source().use(sink::writeAll)
|
inputStream.source().use(sink::writeAll)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
).build()
|
||||||
.build()
|
|
||||||
|
|
||||||
nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
|
nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
|
||||||
|
|
||||||
@ -178,11 +186,16 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
} else if (result.status == "success" && result.nip94Event != null) {
|
} else if (result.status == "success" && result.nip94Event != null) {
|
||||||
return result.nip94Event
|
return result.nip94Event
|
||||||
} else {
|
} else {
|
||||||
throw RuntimeException("Failed to upload with message: ${result.message}")
|
throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, result.message))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw RuntimeException("Error Uploading image: ${response.code}")
|
val explanation = HttpStatusMessages.resourceIdFor(response.code)
|
||||||
|
if (explanation != null) {
|
||||||
|
throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, stringRes(context, explanation)))
|
||||||
|
} else {
|
||||||
|
throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, response.code))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -191,6 +204,7 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
hash: String,
|
hash: String,
|
||||||
contentType: String?,
|
contentType: String?,
|
||||||
server: Nip96Retriever.ServerInfo,
|
server: Nip96Retriever.ServerInfo,
|
||||||
|
context: Context,
|
||||||
): Boolean {
|
): Boolean {
|
||||||
val extension =
|
val extension =
|
||||||
contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
|
contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
|
||||||
@ -216,7 +230,12 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
return result.status == "success"
|
return result.status == "success"
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw RuntimeException("Error Uploading image: ${response.code}")
|
val explanation = HttpStatusMessages.resourceIdFor(response.code)
|
||||||
|
if (explanation != null) {
|
||||||
|
throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, stringRes(context, explanation)))
|
||||||
|
} else {
|
||||||
|
throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, response.code))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -233,7 +252,8 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
onProgress((currentResult.percentage ?: 100) / 100f)
|
onProgress((currentResult.percentage ?: 100) / 100f)
|
||||||
|
|
||||||
val request: Request =
|
val request: Request =
|
||||||
Request.Builder()
|
Request
|
||||||
|
.Builder()
|
||||||
.header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
|
.header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
|
||||||
.url(result.processingUrl)
|
.url(result.processingUrl)
|
||||||
.build()
|
.build()
|
||||||
@ -257,13 +277,12 @@ class Nip96Uploader(val account: Account?) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun nip98Header(url: String): String? {
|
suspend fun nip98Header(url: String): String? =
|
||||||
return withTimeoutOrNull(5000) {
|
withTimeoutOrNull(5000) {
|
||||||
suspendCancellableCoroutine { continuation ->
|
suspendCancellableCoroutine { continuation ->
|
||||||
nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
|
nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fun nip98Header(
|
fun nip98Header(
|
||||||
url: String,
|
url: String,
|
||||||
|
@ -118,7 +118,8 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
|
|||||||
)
|
)
|
||||||
|
|
||||||
fun createOtherAccountsBaseFilter(): TypedFilter? {
|
fun createOtherAccountsBaseFilter(): TypedFilter? {
|
||||||
if (otherAccounts.isEmpty()) return null
|
val otherAuthors = otherAccounts.filter { it != account.userProfile().pubkeyHex }
|
||||||
|
if (otherAuthors.isEmpty()) return null
|
||||||
return TypedFilter(
|
return TypedFilter(
|
||||||
types = EVENT_FINDER_TYPES,
|
types = EVENT_FINDER_TYPES,
|
||||||
filter =
|
filter =
|
||||||
@ -134,7 +135,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
|
|||||||
MuteListEvent.KIND,
|
MuteListEvent.KIND,
|
||||||
PeopleListEvent.KIND,
|
PeopleListEvent.KIND,
|
||||||
),
|
),
|
||||||
authors = otherAccounts.filter { it != account.userProfile().pubkeyHex },
|
authors = otherAuthors,
|
||||||
limit = 100,
|
limit = 100,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
@ -205,38 +205,54 @@ class EventNotificationConsumer(
|
|||||||
event: LnZapEvent,
|
event: LnZapEvent,
|
||||||
acc: Account,
|
acc: Account,
|
||||||
) {
|
) {
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Start ${event.toNostrUri()}")
|
||||||
val noteZapEvent = LocalCache.getNoteIfExists(event.id) ?: return
|
val noteZapEvent = LocalCache.getNoteIfExists(event.id) ?: return
|
||||||
|
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Not Notified Yet")
|
||||||
|
|
||||||
// old event being re-broadcast
|
// old event being re-broadcast
|
||||||
if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
|
if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
|
||||||
|
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Not an old event")
|
||||||
|
|
||||||
val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
|
val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
|
||||||
val noteZapped =
|
val noteZapped =
|
||||||
event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
|
event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
|
||||||
|
|
||||||
|
Log.d("EventNotificationConsumer", "Notify ZapRequest $noteZapRequest zapped $noteZapped")
|
||||||
|
|
||||||
if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
|
if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
|
||||||
|
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Amount Bigger than 10")
|
||||||
|
|
||||||
if (event.isTaggedUser(acc.userProfile().pubkeyHex)) {
|
if (event.isTaggedUser(acc.userProfile().pubkeyHex)) {
|
||||||
val amount = showAmount(event.amount)
|
val amount = showAmount(event.amount)
|
||||||
|
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Amount $amount")
|
||||||
|
|
||||||
(noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
|
(noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
|
||||||
acc.decryptZapContentAuthor(noteZapRequest) {
|
acc.decryptZapContentAuthor(noteZapRequest) {
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Decrypted if Private Zap ${event.id}")
|
||||||
|
|
||||||
val author = LocalCache.getOrCreateUser(it.pubKey)
|
val author = LocalCache.getOrCreateUser(it.pubKey)
|
||||||
val senderInfo = Pair(author, it.content.ifBlank { null })
|
val senderInfo = Pair(author, it.content.ifBlank { null })
|
||||||
|
|
||||||
acc.decryptContent(noteZapped) {
|
acc.decryptContent(noteZapped) {
|
||||||
|
Log.d("EventNotificationConsumer", "Notify Decrypted if Private Note")
|
||||||
|
|
||||||
val zappedContent = it.split("\n").get(0)
|
val zappedContent = it.split("\n").get(0)
|
||||||
|
|
||||||
val user = senderInfo.first.toBestDisplayName()
|
val user = senderInfo.first.toBestDisplayName()
|
||||||
var title =
|
var title = stringRes(applicationContext, R.string.app_notification_zaps_channel_message, amount)
|
||||||
stringRes(applicationContext, R.string.app_notification_zaps_channel_message, amount)
|
|
||||||
senderInfo.second?.ifBlank { null }?.let { title += " ($it)" }
|
senderInfo.second?.ifBlank { null }?.let { title += " ($it)" }
|
||||||
|
|
||||||
var content =
|
var content =
|
||||||
stringRes(
|
stringRes(
|
||||||
applicationContext,
|
applicationContext,
|
||||||
R.string.app_notification_zaps_channel_message_from,
|
R.string.app_notification_zaps_channel_message_from,
|
||||||
user,
|
user,
|
||||||
)
|
)
|
||||||
zappedContent?.let {
|
zappedContent.let {
|
||||||
content +=
|
content +=
|
||||||
" " +
|
" " +
|
||||||
stringRes(
|
stringRes(
|
||||||
@ -247,6 +263,9 @@ class EventNotificationConsumer(
|
|||||||
}
|
}
|
||||||
val userPicture = senderInfo?.first?.profilePicture()
|
val userPicture = senderInfo?.first?.profilePicture()
|
||||||
val noteUri = "nostr:Notifications"
|
val noteUri = "nostr:Notifications"
|
||||||
|
|
||||||
|
Log.d("EventNotificationConsumer", "Notify ${event.id} $content $title $noteUri")
|
||||||
|
|
||||||
notificationManager()
|
notificationManager()
|
||||||
.sendZapNotification(
|
.sendZapNotification(
|
||||||
event.id,
|
event.id,
|
||||||
|
@ -73,7 +73,7 @@ fun stringRes(
|
|||||||
return String
|
return String
|
||||||
.format(
|
.format(
|
||||||
res.configuration.locales.get(0),
|
res.configuration.locales.get(0),
|
||||||
resourceCache.get(id) ?: res.getString(id),
|
resourceCache.get(id) ?: res.getString(id).also { resourceCache.put(id, it) },
|
||||||
*args,
|
*args,
|
||||||
).also { resourceCache.put(id, it) }
|
)
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@Stable
|
@Stable
|
||||||
open class EditPostViewModel() : ViewModel() {
|
open class EditPostViewModel : ViewModel() {
|
||||||
var accountViewModel: AccountViewModel? = null
|
var accountViewModel: AccountViewModel? = null
|
||||||
var account: Account? = null
|
var account: Account? = null
|
||||||
|
|
||||||
@ -185,6 +185,7 @@ open class EditPostViewModel() : ViewModel() {
|
|||||||
server = server.server,
|
server = server.server,
|
||||||
contentResolver = contentResolver,
|
contentResolver = contentResolver,
|
||||||
onProgress = {},
|
onProgress = {},
|
||||||
|
context = context,
|
||||||
)
|
)
|
||||||
|
|
||||||
createNIP94Record(
|
createNIP94Record(
|
||||||
@ -235,13 +236,12 @@ open class EditPostViewModel() : ViewModel() {
|
|||||||
NostrSearchEventOrUserDataSource.clear()
|
NostrSearchEventOrUserDataSource.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
open fun findUrlInMessage(): String? {
|
open fun findUrlInMessage(): String? =
|
||||||
return message.text.split('\n').firstNotNullOfOrNull { paragraph ->
|
message.text.split('\n').firstNotNullOfOrNull { paragraph ->
|
||||||
paragraph.split(' ').firstOrNull { word: String ->
|
paragraph.split(' ').firstOrNull { word: String ->
|
||||||
RichTextParser.isValidURL(word) || RichTextParser.isUrlWithoutScheme(word)
|
RichTextParser.isValidURL(word) || RichTextParser.isUrlWithoutScheme(word)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
open fun updateMessage(it: TextFieldValue) {
|
open fun updateMessage(it: TextFieldValue) {
|
||||||
message = it
|
message = it
|
||||||
@ -249,14 +249,18 @@ open class EditPostViewModel() : ViewModel() {
|
|||||||
|
|
||||||
if (it.selection.collapsed) {
|
if (it.selection.collapsed) {
|
||||||
val lastWord =
|
val lastWord =
|
||||||
it.text.substring(0, it.selection.end).substringAfterLast("\n").substringAfterLast(" ")
|
it.text
|
||||||
|
.substring(0, it.selection.end)
|
||||||
|
.substringAfterLast("\n")
|
||||||
|
.substringAfterLast(" ")
|
||||||
userSuggestionAnchor = it.selection
|
userSuggestionAnchor = it.selection
|
||||||
userSuggestionsMainMessage = UserSuggestionAnchor.MAIN_MESSAGE
|
userSuggestionsMainMessage = UserSuggestionAnchor.MAIN_MESSAGE
|
||||||
if (lastWord.startsWith("@") && lastWord.length > 2) {
|
if (lastWord.startsWith("@") && lastWord.length > 2) {
|
||||||
NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
|
NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
|
||||||
viewModelScope.launch(Dispatchers.IO) {
|
viewModelScope.launch(Dispatchers.IO) {
|
||||||
userSuggestions =
|
userSuggestions =
|
||||||
LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
|
LocalCache
|
||||||
|
.findUsersStartingWith(lastWord.removePrefix("@"))
|
||||||
.sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }, { it.pubkeyHex }))
|
.sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }, { it.pubkeyHex }))
|
||||||
.reversed()
|
.reversed()
|
||||||
}
|
}
|
||||||
@ -271,7 +275,10 @@ open class EditPostViewModel() : ViewModel() {
|
|||||||
userSuggestionAnchor?.let {
|
userSuggestionAnchor?.let {
|
||||||
if (userSuggestionsMainMessage == UserSuggestionAnchor.MAIN_MESSAGE) {
|
if (userSuggestionsMainMessage == UserSuggestionAnchor.MAIN_MESSAGE) {
|
||||||
val lastWord =
|
val lastWord =
|
||||||
message.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
|
message.text
|
||||||
|
.substring(0, it.end)
|
||||||
|
.substringAfterLast("\n")
|
||||||
|
.substringAfterLast(" ")
|
||||||
val lastWordStart = it.end - lastWord.length
|
val lastWordStart = it.end - lastWord.length
|
||||||
val wordToInsert = "@${item.pubkeyNpub()}"
|
val wordToInsert = "@${item.pubkeyNpub()}"
|
||||||
|
|
||||||
@ -288,12 +295,11 @@ open class EditPostViewModel() : ViewModel() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun canPost(): Boolean {
|
fun canPost(): Boolean =
|
||||||
return message.text.isNotBlank() &&
|
message.text.isNotBlank() &&
|
||||||
!isUploadingImage &&
|
!isUploadingImage &&
|
||||||
!wantsInvoice &&
|
!wantsInvoice &&
|
||||||
contentToAddUrl == null
|
contentToAddUrl == null
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun createNIP94Record(
|
suspend fun createNIP94Record(
|
||||||
uploadingResult: Nip96Uploader.PartialEvent,
|
uploadingResult: Nip96Uploader.PartialEvent,
|
||||||
@ -304,11 +310,20 @@ open class EditPostViewModel() : ViewModel() {
|
|||||||
// Images don't seem to be ready immediately after upload
|
// Images don't seem to be ready immediately after upload
|
||||||
val imageUrl = uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
|
val imageUrl = uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
|
||||||
val remoteMimeType =
|
val remoteMimeType =
|
||||||
uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "m" }?.get(1)?.ifBlank { null }
|
uploadingResult.tags
|
||||||
|
?.firstOrNull { it.size > 1 && it[0] == "m" }
|
||||||
|
?.get(1)
|
||||||
|
?.ifBlank { null }
|
||||||
val originalHash =
|
val originalHash =
|
||||||
uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "ox" }?.get(1)?.ifBlank { null }
|
uploadingResult.tags
|
||||||
|
?.firstOrNull { it.size > 1 && it[0] == "ox" }
|
||||||
|
?.get(1)
|
||||||
|
?.ifBlank { null }
|
||||||
val dim =
|
val dim =
|
||||||
uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "dim" }?.get(1)?.ifBlank { null }
|
uploadingResult.tags
|
||||||
|
?.firstOrNull { it.size > 1 && it[0] == "dim" }
|
||||||
|
?.get(1)
|
||||||
|
?.ifBlank { null }
|
||||||
val magnet =
|
val magnet =
|
||||||
uploadingResult.tags
|
uploadingResult.tags
|
||||||
?.firstOrNull { it.size > 1 && it[0] == "magnet" }
|
?.firstOrNull { it.size > 1 && it[0] == "magnet" }
|
||||||
|
@ -139,6 +139,7 @@ open class NewMediaModel : ViewModel() {
|
|||||||
onProgress = { percent: Float ->
|
onProgress = { percent: Float ->
|
||||||
uploadingPercentage.value = 0.2f + (0.2f * percent)
|
uploadingPercentage.value = 0.2f + (0.2f * percent)
|
||||||
},
|
},
|
||||||
|
context = context,
|
||||||
)
|
)
|
||||||
|
|
||||||
createNIP94Record(
|
createNIP94Record(
|
||||||
|
@ -801,6 +801,7 @@ open class NewPostViewModel : ViewModel() {
|
|||||||
server = server.server,
|
server = server.server,
|
||||||
contentResolver = contentResolver,
|
contentResolver = contentResolver,
|
||||||
onProgress = {},
|
onProgress = {},
|
||||||
|
context = context,
|
||||||
)
|
)
|
||||||
|
|
||||||
createNIP94Record(
|
createNIP94Record(
|
||||||
|
@ -184,6 +184,7 @@ class NewUserMetadataViewModel : ViewModel() {
|
|||||||
server = account.defaultFileServer,
|
server = account.defaultFileServer,
|
||||||
contentResolver = contentResolver,
|
contentResolver = contentResolver,
|
||||||
onProgress = {},
|
onProgress = {},
|
||||||
|
context = context,
|
||||||
)
|
)
|
||||||
|
|
||||||
val url = result.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
|
val url = result.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
<string name="could_not_decrypt_the_message">Nie można odszyfrować wiadomości</string>
|
<string name="could_not_decrypt_the_message">Nie można odszyfrować wiadomości</string>
|
||||||
<string name="group_picture">Zdjęcie grupy</string>
|
<string name="group_picture">Zdjęcie grupy</string>
|
||||||
<string name="explicit_content">Niedozwolona zawartość</string>
|
<string name="explicit_content">Niedozwolona zawartość</string>
|
||||||
|
<string name="spam">Spam</string>
|
||||||
<string name="spam_description">Liczba spamu z tego transmitera</string>
|
<string name="spam_description">Liczba spamu z tego transmitera</string>
|
||||||
<string name="impersonation">Podszywanie się</string>
|
<string name="impersonation">Podszywanie się</string>
|
||||||
<string name="illegal_behavior">Antyspołeczne zachowanie</string>
|
<string name="illegal_behavior">Antyspołeczne zachowanie</string>
|
||||||
@ -199,6 +200,8 @@
|
|||||||
<string name="never">nigdy</string>
|
<string name="never">nigdy</string>
|
||||||
<string name="now">teraz</string>
|
<string name="now">teraz</string>
|
||||||
<string name="h">godz.</string>
|
<string name="h">godz.</string>
|
||||||
|
<string name="m">m</string>
|
||||||
|
<string name="d">d</string>
|
||||||
<string name="nudity">Nagość</string>
|
<string name="nudity">Nagość</string>
|
||||||
<string name="profanity_hateful_speech">Wulgaryzmy / Mowa nienawiści</string>
|
<string name="profanity_hateful_speech">Wulgaryzmy / Mowa nienawiści</string>
|
||||||
<string name="report_hateful_speech">Zgłoś nienawistną mowę</string>
|
<string name="report_hateful_speech">Zgłoś nienawistną mowę</string>
|
||||||
@ -301,6 +304,7 @@
|
|||||||
<string name="poll_zap_value_min">Minimalny Zap</string>
|
<string name="poll_zap_value_min">Minimalny Zap</string>
|
||||||
<string name="poll_zap_value_max">Maksymalny Zap</string>
|
<string name="poll_zap_value_max">Maksymalny Zap</string>
|
||||||
<string name="poll_consensus_threshold">Konsensus</string>
|
<string name="poll_consensus_threshold">Konsensus</string>
|
||||||
|
<string name="poll_consensus_threshold_percent">(0–100)%</string>
|
||||||
<string name="poll_closing_time">Zamknij po</string>
|
<string name="poll_closing_time">Zamknij po</string>
|
||||||
<string name="poll_closing_time_days">dni</string>
|
<string name="poll_closing_time_days">dni</string>
|
||||||
<string name="poll_unable_to_vote">Nie można głosować</string>
|
<string name="poll_unable_to_vote">Nie można głosować</string>
|
||||||
@ -383,6 +387,7 @@
|
|||||||
<string name="warn_when_posts_have_reports_from_your_follows">Ostrzegaj, gdy posty zostały zgłoszone przez osoby które obserwujesz</string>
|
<string name="warn_when_posts_have_reports_from_your_follows">Ostrzegaj, gdy posty zostały zgłoszone przez osoby które obserwujesz</string>
|
||||||
<string name="new_reaction_symbol">Nowy Symbol Odzewu</string>
|
<string name="new_reaction_symbol">Nowy Symbol Odzewu</string>
|
||||||
<string name="no_reaction_type_setup_long_press_to_change">Brak wstępnie wybranych typów reakcji dla tego użytkownika. Przytrzymaj przycisk serce, aby zmienić</string>
|
<string name="no_reaction_type_setup_long_press_to_change">Brak wstępnie wybranych typów reakcji dla tego użytkownika. Przytrzymaj przycisk serce, aby zmienić</string>
|
||||||
|
<string name="zapraiser">Zapraiser</string>
|
||||||
<string name="zapraiser_explainer">Dodaje docelową liczbę satów do podniesienia dla tego wpisu. W zależności od aplikacji może być pokazywany to jako pasek postępu, aby zachęcić do darowizn</string>
|
<string name="zapraiser_explainer">Dodaje docelową liczbę satów do podniesienia dla tego wpisu. W zależności od aplikacji może być pokazywany to jako pasek postępu, aby zachęcić do darowizn</string>
|
||||||
<string name="zapraiser_target_amount_in_sats">Docelowa kwota w Satach</string>
|
<string name="zapraiser_target_amount_in_sats">Docelowa kwota w Satach</string>
|
||||||
<string name="sats_to_complete">Zapraiser przy: %1$s. %2$s satach do celu</string>
|
<string name="sats_to_complete">Zapraiser przy: %1$s. %2$s satach do celu</string>
|
||||||
@ -414,6 +419,7 @@
|
|||||||
<string name="minimum_pow">Minimalny poW</string>
|
<string name="minimum_pow">Minimalny poW</string>
|
||||||
<string name="auth">Autoryzacja</string>
|
<string name="auth">Autoryzacja</string>
|
||||||
<string name="payment">Płatność</string>
|
<string name="payment">Płatność</string>
|
||||||
|
<string name="cashu">Cashu Token</string>
|
||||||
<string name="cashu_redeem">Wykup</string>
|
<string name="cashu_redeem">Wykup</string>
|
||||||
<string name="cashu_redeem_to_zap">Wyślij do Zap Wallet</string>
|
<string name="cashu_redeem_to_zap">Wyślij do Zap Wallet</string>
|
||||||
<string name="cashu_redeem_to_cashu">Otwórz w Portfelu Cashu</string>
|
<string name="cashu_redeem_to_cashu">Otwórz w Portfelu Cashu</string>
|
||||||
@ -507,6 +513,7 @@
|
|||||||
<string name="poll_zap_value_min_max_explainer">Głosy są oceniane na podstawie ilości zapperów. Możesz ustawić minimalną kwotę, aby uniknąć spamerów i maksymalną kwotę, aby uniknąć przejęcia ankiety przez dużych zapperów. Użyj tej samej kwoty w obu polach, aby upewnić się, że każdy głos ma taką samą wartość. Pozostaw to pole puste, aby zaakceptować dowolną kwotę.</string>
|
<string name="poll_zap_value_min_max_explainer">Głosy są oceniane na podstawie ilości zapperów. Możesz ustawić minimalną kwotę, aby uniknąć spamerów i maksymalną kwotę, aby uniknąć przejęcia ankiety przez dużych zapperów. Użyj tej samej kwoty w obu polach, aby upewnić się, że każdy głos ma taką samą wartość. Pozostaw to pole puste, aby zaakceptować dowolną kwotę.</string>
|
||||||
<string name="error_dialog_zap_error">Nie można wysłać zapa</string>
|
<string name="error_dialog_zap_error">Nie można wysłać zapa</string>
|
||||||
<string name="error_dialog_talk_to_user">Wyślij wiadomość użytkownikowi</string>
|
<string name="error_dialog_talk_to_user">Wyślij wiadomość użytkownikowi</string>
|
||||||
|
<string name="error_dialog_button_ok">OK</string>
|
||||||
<string name="relay_information_document_error_assemble_url">Nieudane połączenie z %1$s: %2$s</string>
|
<string name="relay_information_document_error_assemble_url">Nieudane połączenie z %1$s: %2$s</string>
|
||||||
<string name="relay_information_document_error_failed_to_assemble_url">Nie udało się skompilować adresu URL NIP-11 dla %1$s: %2$s</string>
|
<string name="relay_information_document_error_failed_to_assemble_url">Nie udało się skompilować adresu URL NIP-11 dla %1$s: %2$s</string>
|
||||||
<string name="relay_information_document_error_failed_to_reach_server">Nieudane połączenie z %1$s: %2$s</string>
|
<string name="relay_information_document_error_failed_to_reach_server">Nieudane połączenie z %1$s: %2$s</string>
|
||||||
@ -527,6 +534,7 @@
|
|||||||
<string name="missing_lud16">Brakująca konfiguracja LN</string>
|
<string name="missing_lud16">Brakująca konfiguracja LN</string>
|
||||||
<string name="user_x_does_not_have_a_lightning_address_setup_to_receive_sats">Użytkownik %1$s nie ma skonfigurowanego adresu LN, aby odbierać saty</string>
|
<string name="user_x_does_not_have_a_lightning_address_setup_to_receive_sats">Użytkownik %1$s nie ma skonfigurowanego adresu LN, aby odbierać saty</string>
|
||||||
<string name="zap_split_weight">Procentowo</string>
|
<string name="zap_split_weight">Procentowo</string>
|
||||||
|
<string name="zap_split_weight_placeholder">25</string>
|
||||||
<string name="splitting_zaps_with">Podziel zapsy z</string>
|
<string name="splitting_zaps_with">Podziel zapsy z</string>
|
||||||
<string name="forwarding_zaps_to">Przesyłanie zapasów do</string>
|
<string name="forwarding_zaps_to">Przesyłanie zapasów do</string>
|
||||||
<string name="lightning_wallets_not_found2">Nie znaleziono portfeli Lightning</string>
|
<string name="lightning_wallets_not_found2">Nie znaleziono portfeli Lightning</string>
|
||||||
@ -593,9 +601,11 @@
|
|||||||
<string name="hi_there_is_this_still_available">Cześć, czy to jest nadal dostępne?</string>
|
<string name="hi_there_is_this_still_available">Cześć, czy to jest nadal dostępne?</string>
|
||||||
<string name="classifieds">Sprzedaj przedmiot</string>
|
<string name="classifieds">Sprzedaj przedmiot</string>
|
||||||
<string name="classifieds_title">Tytuł</string>
|
<string name="classifieds_title">Tytuł</string>
|
||||||
|
<string name="classifieds_title_placeholder">iPhone 13</string>
|
||||||
<string name="classifieds_condition">Stan</string>
|
<string name="classifieds_condition">Stan</string>
|
||||||
<string name="classifieds_category">Kategoria</string>
|
<string name="classifieds_category">Kategoria</string>
|
||||||
<string name="classifieds_price">Cena (w Satach)</string>
|
<string name="classifieds_price">Cena (w Satach)</string>
|
||||||
|
<string name="classifieds_price_placeholder">1000</string>
|
||||||
<string name="classifieds_location">Lokalizacja</string>
|
<string name="classifieds_location">Lokalizacja</string>
|
||||||
<string name="classifieds_location_placeholder">Miasto, Województwo, Kraj</string>
|
<string name="classifieds_location_placeholder">Miasto, Województwo, Kraj</string>
|
||||||
<string name="classifieds_condition_new">Nowość</string>
|
<string name="classifieds_condition_new">Nowość</string>
|
||||||
@ -614,6 +624,7 @@
|
|||||||
<string name="classifieds_category_books">Książki</string>
|
<string name="classifieds_category_books">Książki</string>
|
||||||
<string name="classifieds_category_pets">Zwierzęta domowe</string>
|
<string name="classifieds_category_pets">Zwierzęta domowe</string>
|
||||||
<string name="classifieds_category_sports">Sporty</string>
|
<string name="classifieds_category_sports">Sporty</string>
|
||||||
|
<string name="classifieds_category_fitness">Fitness</string>
|
||||||
<string name="classifieds_category_art">Sztuka</string>
|
<string name="classifieds_category_art">Sztuka</string>
|
||||||
<string name="classifieds_category_crafts">Rzemiosło</string>
|
<string name="classifieds_category_crafts">Rzemiosło</string>
|
||||||
<string name="classifieds_category_home">AGD</string>
|
<string name="classifieds_category_home">AGD</string>
|
||||||
@ -628,6 +639,8 @@
|
|||||||
<string name="server_did_not_provide_a_url_after_uploading">Serwer nie podał adresu URL po załadowaniu</string>
|
<string name="server_did_not_provide_a_url_after_uploading">Serwer nie podał adresu URL po załadowaniu</string>
|
||||||
<string name="could_not_download_from_the_server">Nie można pobrać przesłanych plików z serwera</string>
|
<string name="could_not_download_from_the_server">Nie można pobrać przesłanych plików z serwera</string>
|
||||||
<string name="could_not_prepare_local_file_to_upload">Nie można przygotować pliku lokalnego do przesłania: %1$s</string>
|
<string name="could_not_prepare_local_file_to_upload">Nie można przygotować pliku lokalnego do przesłania: %1$s</string>
|
||||||
|
<string name="failed_to_upload_with_message">Nie udało się przesłać: %1$s</string>
|
||||||
|
<string name="failed_to_delete_with_message">Nie udało się usunąć: %1$s</string>
|
||||||
<string name="edit_draft">Edytuj wersję roboczą</string>
|
<string name="edit_draft">Edytuj wersję roboczą</string>
|
||||||
<string name="login_with_qr_code">Zaloguj się przy użyciu QR kodu</string>
|
<string name="login_with_qr_code">Zaloguj się przy użyciu QR kodu</string>
|
||||||
<string name="route">Ścieżka</string>
|
<string name="route">Ścieżka</string>
|
||||||
@ -647,6 +660,7 @@
|
|||||||
<string name="reply_description">Odpowiedz</string>
|
<string name="reply_description">Odpowiedz</string>
|
||||||
<string name="boost_or_quote_description">Zrepostuj lub Zacytuj</string>
|
<string name="boost_or_quote_description">Zrepostuj lub Zacytuj</string>
|
||||||
<string name="like_description">Lubię</string>
|
<string name="like_description">Lubię</string>
|
||||||
|
<string name="zap_description">Zap</string>
|
||||||
<string name="change_reaction">Zmień odzew</string>
|
<string name="change_reaction">Zmień odzew</string>
|
||||||
<string name="profile_image_of_user">Zdjęcie profilowe %1$s</string>
|
<string name="profile_image_of_user">Zdjęcie profilowe %1$s</string>
|
||||||
<string name="relay_info">Transmiter %1$s</string>
|
<string name="relay_info">Transmiter %1$s</string>
|
||||||
@ -658,6 +672,7 @@
|
|||||||
<string name="add_bitcoin_invoice">Faktura Bitcoin</string>
|
<string name="add_bitcoin_invoice">Faktura Bitcoin</string>
|
||||||
<string name="cancel_bitcoin_invoice">Anuluj fakturę Bitcoin</string>
|
<string name="cancel_bitcoin_invoice">Anuluj fakturę Bitcoin</string>
|
||||||
<string name="cancel_classifieds">Anuluj sprzedaż przedmiotu</string>
|
<string name="cancel_classifieds">Anuluj sprzedaż przedmiotu</string>
|
||||||
|
<string name="add_zapraiser">Zapraiser</string>
|
||||||
<string name="cancel_zapraiser">Anuluj Zapraiser</string>
|
<string name="cancel_zapraiser">Anuluj Zapraiser</string>
|
||||||
<string name="add_location">Lokalizacja</string>
|
<string name="add_location">Lokalizacja</string>
|
||||||
<string name="remove_location">Usuń lokalizację</string>
|
<string name="remove_location">Usuń lokalizację</string>
|
||||||
@ -710,6 +725,7 @@
|
|||||||
<string name="git_repository">Repozytorium Git: %1$s</string>
|
<string name="git_repository">Repozytorium Git: %1$s</string>
|
||||||
<string name="git_web_address">Strona internetowa:</string>
|
<string name="git_web_address">Strona internetowa:</string>
|
||||||
<string name="git_clone_address">Klonuj:</string>
|
<string name="git_clone_address">Klonuj:</string>
|
||||||
|
<string name="existed_since">OTS: %1$s</string>
|
||||||
<string name="ots_info_title">Potwierdzenie znacznika czasu</string>
|
<string name="ots_info_title">Potwierdzenie znacznika czasu</string>
|
||||||
<string name="ots_info_description">Istnieje dowód na to, że ten post został podpisany przed %1$s. Dowód został opatrzony pieczęcią w łańcuchu bloków Bitcoin w tym dniu i czasie.</string>
|
<string name="ots_info_description">Istnieje dowód na to, że ten post został podpisany przed %1$s. Dowód został opatrzony pieczęcią w łańcuchu bloków Bitcoin w tym dniu i czasie.</string>
|
||||||
<string name="edit_post">Edytuj wpis</string>
|
<string name="edit_post">Edytuj wpis</string>
|
||||||
@ -737,4 +753,27 @@
|
|||||||
<string name="dvm_requesting_job">Zapytanie o pracę z DVM</string>
|
<string name="dvm_requesting_job">Zapytanie o pracę z DVM</string>
|
||||||
<string name="nwc_payment_request">Prośba o płatność została wysłana, oczekiwanie na potwierdzenie z Twojego portfela</string>
|
<string name="nwc_payment_request">Prośba o płatność została wysłana, oczekiwanie na potwierdzenie z Twojego portfela</string>
|
||||||
<string name="dvm_waiting_to_confirm_payment">Oczekiwanie na potwierdzenie płatności lub wysłanie wyników DVM</string>
|
<string name="dvm_waiting_to_confirm_payment">Oczekiwanie na potwierdzenie płatności lub wysłanie wyników DVM</string>
|
||||||
|
<string name="http_status_400">Błędne żądanie-Serwer nie może lub nie chce przetworzyć żądania.</string>
|
||||||
|
<string name="http_status_401">Nieautoryzowany - użytkownik nie ma prawidłowych danych uwierzytelniających</string>
|
||||||
|
<string name="http_status_402">Wymagana płatność - serwer wymaga płatności, aby wypełnić żądanie</string>
|
||||||
|
<string name="http_status_403">Zabronione - użytkownik nie ma praw dostępu, aby złożyć żądanie</string>
|
||||||
|
<string name="http_status_404">Nie znaleziono - serwer nie może odnaleźć żądanego adresu</string>
|
||||||
|
<string name="http_status_405">Metoda niedozwolona - serwer obsługuje metodę żądania, ale nie docelowy zasób</string>
|
||||||
|
<string name="http_status_406">Niedopuszczalne - Serwer nie znalazł żadnej zawartości spełniającej żądanie.</string>
|
||||||
|
<string name="http_status_407">Wymagane uwierzytelnianie proxy - użytkownik nie ma prawidłowych danych uwierzytelniania</string>
|
||||||
|
<string name="http_status_408">Limit czasu żądania - serwer przekroczył limit czasu, oczekując na kogoś innego</string>
|
||||||
|
<string name="http_status_409">Konflikt - serwer nie może spełnić żądania, ponieważ istnieje konflikt z zasobem</string>
|
||||||
|
<string name="http_status_410">Przepadło - Żądana zawartość została trwale usunięta z serwera i nie zostanie przywrócona</string>
|
||||||
|
<string name="http_status_411">Wymagana długość - serwer odrzuca żądanie, ponieważ wymaga zdefiniowanej</string>
|
||||||
|
<string name="http_status_414">URI Zbyt długi - URL klienta jest zbyt długi, aby serwer mógł go przetworzyć. </string>
|
||||||
|
<string name="http_status_415">Nieobsługiwany format plików - żądanie używa formatu multimediów, którego serwer nie obsługuje</string>
|
||||||
|
<string name="http_status_426">Wymagana aktualizacja - serwer odmawia przetwarzania żądania przy użyciu bieżącego protokołu, chyba że klient uaktualni go do innego protokołu.</string>
|
||||||
|
<string name="http_status_500">Wewnętrzny błąd serwera - serwer napotkał nieoczekiwany błąd i nie może zakończyć żądania</string>
|
||||||
|
<string name="http_status_501">Nie zaimplementowano - serwer nie może spełnić żądania lub nie rozpoznaje metody żądania</string>
|
||||||
|
<string name="http_status_503">Usługa niedostępna - Często zdarza się, gdy serwer jest przeciążony lub wyłączony w celu konserwacji</string>
|
||||||
|
<string name="http_status_505">Wersja HTTP nie jest obsługiwana - serwer nie obsługuje wersji HTTP w zapytaniu</string>
|
||||||
|
<string name="http_status_506">Wariant również Negocjacje - serwer ma błąd konfiguracji wewnętrznej</string>
|
||||||
|
<string name="http_status_507">Niewystarczająca pojemność - serwer nie ma wystarczającej pojemność, aby pomyślnie przetworzyć żądanie</string>
|
||||||
|
<string name="http_status_508">Wykryta pętla - serwer wykrywa nieskończoną pętlę podczas przetwarzania żądania</string>
|
||||||
|
<string name="http_status_511">Wymagane uwierzytelnienie sieciowe - Klient musi być uwierzytelniony aby uzyskać dostęp do sieci</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -103,6 +103,7 @@
|
|||||||
<string name="add_a_relay">添加中继器</string>
|
<string name="add_a_relay">添加中继器</string>
|
||||||
<string name="display_name">显示名称</string>
|
<string name="display_name">显示名称</string>
|
||||||
<string name="my_display_name">我的显示名称</string>
|
<string name="my_display_name">我的显示名称</string>
|
||||||
|
<string name="my_awesome_name">Nostr 太酷了</string>
|
||||||
<string name="welcome">欢迎!</string>
|
<string name="welcome">欢迎!</string>
|
||||||
<string name="username">用户名</string>
|
<string name="username">用户名</string>
|
||||||
<string name="my_username">我的用户名</string>
|
<string name="my_username">我的用户名</string>
|
||||||
@ -386,6 +387,7 @@
|
|||||||
<string name="warn_when_posts_have_reports_from_your_follows">当帖子有你的关注的报告时警告</string>
|
<string name="warn_when_posts_have_reports_from_your_follows">当帖子有你的关注的报告时警告</string>
|
||||||
<string name="new_reaction_symbol">新回应符号</string>
|
<string name="new_reaction_symbol">新回应符号</string>
|
||||||
<string name="no_reaction_type_setup_long_press_to_change">未选择回应类型。长按可更改</string>
|
<string name="no_reaction_type_setup_long_press_to_change">未选择回应类型。长按可更改</string>
|
||||||
|
<string name="zapraiser">Zapraiser</string>
|
||||||
<string name="zapraiser_explainer">为这个帖子添加目标聪金额。支持的客户端可以将此显示为奖励捐赠的进度条</string>
|
<string name="zapraiser_explainer">为这个帖子添加目标聪金额。支持的客户端可以将此显示为奖励捐赠的进度条</string>
|
||||||
<string name="zapraiser_target_amount_in_sats">目标聪金额</string>
|
<string name="zapraiser_target_amount_in_sats">目标聪金额</string>
|
||||||
<string name="sats_to_complete">Zapraiser 位于 %1$s。距离目标%2$s聪</string>
|
<string name="sats_to_complete">Zapraiser 位于 %1$s。距离目标%2$s聪</string>
|
||||||
@ -671,6 +673,7 @@
|
|||||||
<string name="add_bitcoin_invoice">比特币发票</string>
|
<string name="add_bitcoin_invoice">比特币发票</string>
|
||||||
<string name="cancel_bitcoin_invoice">取消比特币发票</string>
|
<string name="cancel_bitcoin_invoice">取消比特币发票</string>
|
||||||
<string name="cancel_classifieds">取消出售物品</string>
|
<string name="cancel_classifieds">取消出售物品</string>
|
||||||
|
<string name="add_zapraiser">Zapraiser</string>
|
||||||
<string name="cancel_zapraiser">取消 Zapraiser</string>
|
<string name="cancel_zapraiser">取消 Zapraiser</string>
|
||||||
<string name="add_location">地点</string>
|
<string name="add_location">地点</string>
|
||||||
<string name="remove_location">移除地点</string>
|
<string name="remove_location">移除地点</string>
|
||||||
|
@ -763,6 +763,8 @@
|
|||||||
<string name="server_did_not_provide_a_url_after_uploading">Server did not provide a URL after uploading</string>
|
<string name="server_did_not_provide_a_url_after_uploading">Server did not provide a URL after uploading</string>
|
||||||
<string name="could_not_download_from_the_server">Could not download uploaded media from the server</string>
|
<string name="could_not_download_from_the_server">Could not download uploaded media from the server</string>
|
||||||
<string name="could_not_prepare_local_file_to_upload">Could not prepare local file to upload: %1$s</string>
|
<string name="could_not_prepare_local_file_to_upload">Could not prepare local file to upload: %1$s</string>
|
||||||
|
<string name="failed_to_upload_with_message">Failed to upload: %1$s</string>
|
||||||
|
<string name="failed_to_delete_with_message">Failed to delete: %1$s</string>
|
||||||
|
|
||||||
<string name="edit_draft">Edit draft</string>
|
<string name="edit_draft">Edit draft</string>
|
||||||
|
|
||||||
@ -898,4 +900,35 @@
|
|||||||
<string name="dvm_requesting_job">Requesting Job from DVM</string>
|
<string name="dvm_requesting_job">Requesting Job from DVM</string>
|
||||||
<string name="nwc_payment_request">Payment request sent, waiting for confirmation from your wallet</string>
|
<string name="nwc_payment_request">Payment request sent, waiting for confirmation from your wallet</string>
|
||||||
<string name="dvm_waiting_to_confirm_payment">Waiting for DVM to confirm payment or send results</string>
|
<string name="dvm_waiting_to_confirm_payment">Waiting for DVM to confirm payment or send results</string>
|
||||||
|
|
||||||
|
<string name="http_status_400">Bad Request - The server can’t or won’t process the request.</string>
|
||||||
|
<string name="http_status_401">Unauthorized - The user doesn’t have valid authentication credentials</string>
|
||||||
|
<string name="http_status_402">Payment Required - The server requires payment to complete the request</string>
|
||||||
|
<string name="http_status_403">Forbidden - The user doesn’t have access rights to make the request</string>
|
||||||
|
<string name="http_status_404">Not Found - The server can’t find the requested address</string>
|
||||||
|
<string name="http_status_405">Method Not Allowed - The server supports the request method, but not the target resource</string>
|
||||||
|
<string name="http_status_406">Not Acceptable - The server doesn’t find any content that satisfies the request.</string>
|
||||||
|
<string name="http_status_407">Proxy Authentication Required - The user doesn’t have valid authentication credentials</string>
|
||||||
|
<string name="http_status_408">Request Timeout - The server timed out waiting for somebody else</string>
|
||||||
|
<string name="http_status_409">Conflict - The server can’t fulfill the request because there’s a conflict with the resource</string>
|
||||||
|
<string name="http_status_410">Gone - The content requested has been permanently deleted from the server and will not be reinstated</string>
|
||||||
|
<string name="http_status_411">Length Required - The server rejects the request because it requires a defined</string>
|
||||||
|
<string name="http_status_412">Precondition Failed - The request\'s preconditions in the header fields that the server fails to meet</string>
|
||||||
|
<string name="http_status_413">Payload Too Large - The request is larger than the server’s defined limits, and the server refuses to process it</string>
|
||||||
|
<string name="http_status_414">URI Too Long - The url requested by the client is too long for the server to process. </string>
|
||||||
|
<string name="http_status_415">Unsupported Media Type - The request uses a media format the server does not support</string>
|
||||||
|
<string name="http_status_416">Range Not Satisfiable - The server can’t fulfill the value indicated in the request’s Range header field. </string>
|
||||||
|
<string name="http_status_417">Expectation Failed - The server can’t meet the requirements indicated by the Expect request header field</string>
|
||||||
|
<string name="http_status_426">Upgrade Required - The server refuses to process the request using the current protocol unless the client upgrades to a different protocol.</string>
|
||||||
|
|
||||||
|
<string name="http_status_500">Internal Server Error - The server has encountered an unexpected error and cannot complete the request</string>
|
||||||
|
<string name="http_status_501">Not Implemented - The server can’t fulfill the request or doesn’t recognize the request method</string>
|
||||||
|
<string name="http_status_502">Bad Gateway - The server acts as a gateway and got an invalid response from the host</string>
|
||||||
|
<string name="http_status_503">Service Unavailable - This often occurs when a server is overloaded or down for maintenance</string>
|
||||||
|
<string name="http_status_504">Gateway Timeout - The server was acting as a gateway or proxy and timed out, waiting for a response</string>
|
||||||
|
<string name="http_status_505">HTTP Version Not Supported - The server doesn’t support the HTTP version in the request</string>
|
||||||
|
<string name="http_status_506">Variant Also Negotiates - The server has an internal configuration error</string>
|
||||||
|
<string name="http_status_507">Insufficient Storage - The server doesn’t have enough storage to process the request successfully</string>
|
||||||
|
<string name="http_status_508">Loop Detected - The server detects an infinite loop while processing the request</string>
|
||||||
|
<string name="http_status_511">Network Authentication Required - The client must be authenticated to access the network</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
Reference in New Issue
Block a user