From 8a408c49250b00091d9b0f634982070fc555c924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=93=D0=BE=D1=80?= =?UTF-8?q?=D0=BF=D0=B8=D0=BD=D1=96=D1=87?= Date: Mon, 24 Feb 2025 01:03:36 +0100 Subject: [PATCH 01/10] Translated using Weblate (Ukrainian) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (61 of 61 strings) Co-authored-by: Максим Горпиніч Translate-URL: https://hosted.weblate.org/projects/fedilab/description/uk/ Translation: Fedilab/description --- .../metadata/android/uk/changelogs/517.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/fdroid/fastlane/metadata/android/uk/changelogs/517.txt diff --git a/src/fdroid/fastlane/metadata/android/uk/changelogs/517.txt b/src/fdroid/fastlane/metadata/android/uk/changelogs/517.txt new file mode 100644 index 00000000..b8908b5b --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/uk/changelogs/517.txt @@ -0,0 +1,16 @@ +Додано: +— Дозволяє редагувати заплановані повідомлення з боку сервера + +Змінено: +- Упорядкувати назву списку в алфавітному порядку в профілях +- Видалити реєстрацію для Google + +Виправлено: +- Push-повідомлення +— Засіб вибору екземплярів Peertube +- Редагувати заплановані потоки (локальні) +- Миттєвий пошук хештегу повторює результати +- Цитати розбиті за допомогою Markdowns +- Виправлено збої звітів після надсилання +- Виправлено вибір емодзі, коли немає результату +- Виправити інші збої From e3a862abffa070a745050fcf97ca1b4f011fa747 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Mon, 24 Feb 2025 17:57:10 +0100 Subject: [PATCH 02/10] Added translation using Weblate (Lithuanian) Co-authored-by: Languages add-on --- app/src/main/res/values-lt/strings.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/src/main/res/values-lt/strings.xml diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml new file mode 100644 index 00000000..a6b3daec --- /dev/null +++ b/app/src/main/res/values-lt/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 5f53cb39bdebaa5693a3d65e5494c9dac0d1cbb4 Mon Sep 17 00:00:00 2001 From: Vaclovas Intas Date: Mon, 24 Feb 2025 19:40:00 +0100 Subject: [PATCH 03/10] Translated using Weblate (Lithuanian) Currently translated at 3.2% (2 of 61 strings) Co-authored-by: Vaclovas Intas Translate-URL: https://hosted.weblate.org/projects/fedilab/description/lt/ Translation: Fedilab/description --- src/fdroid/fastlane/metadata/android/lt/short_description.txt | 1 + src/fdroid/fastlane/metadata/android/lt/title.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/fdroid/fastlane/metadata/android/lt/short_description.txt create mode 100644 src/fdroid/fastlane/metadata/android/lt/title.txt diff --git a/src/fdroid/fastlane/metadata/android/lt/short_description.txt b/src/fdroid/fastlane/metadata/android/lt/short_description.txt new file mode 100644 index 00000000..111970c2 --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/lt/short_description.txt @@ -0,0 +1 @@ +„Fedilab“ - daugiafunkcinis „Android“ kliento programą pasiekti paskirstytąją fediversą, kurią sudaro mikrotinklaraščiai, nuotraukų bendrinimas ir vaizdo įrašų priegloba. diff --git a/src/fdroid/fastlane/metadata/android/lt/title.txt b/src/fdroid/fastlane/metadata/android/lt/title.txt new file mode 100644 index 00000000..e6f369e8 --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/lt/title.txt @@ -0,0 +1 @@ +Fedilab From 8512db5c012c446b7b3d736791ff2bceb632aad0 Mon Sep 17 00:00:00 2001 From: Vaclovas Intas Date: Tue, 25 Feb 2025 08:11:50 +0100 Subject: [PATCH 04/10] Translated using Weblate (Lithuanian) Currently translated at 24.5% (292 of 1190 strings) Co-authored-by: Vaclovas Intas Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/lt/ Translation: Fedilab/Strings --- app/src/main/res/values-lt/strings.xml | 81 +++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a6b3daec..2c526678 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,2 +1,81 @@ - \ No newline at end of file + + Apie + Apie serverį + Podėlis + Atsijungti + Užverti + Taip + Atsisiųsti %1$s + Medija išsaugota + Failas: %1$s + Slaptažodis + El. paštas + Paskyros + Žinutės + Žymės + Išsaugoti + Serveris + Serveris: mastodon.social + Dabar veikia su paskyra %1$s + Įtraukti paskyrą + Žinutės turinys nukopijuotas į iškarpinę + Žinutės URL nukopijuotas į iškarpinę + Informacija nukopijuota į iškarpinę + Jau sekate šią žymę! + Fotoaparatas + Ištrinti viską + Planuoti + Teksto dydžiai + Piktogramos dydžiai + Sekantis + Ankstesnis + Atverti su + Patvirtinti + Medija + Bendrinti su + Bendrinta per „Fedilab‚ + Juodraščiai + Mėgstami + Paminėjimai + Pasidalinimai + Rodyti pasidalinimus + Rodyti atsakymus + Rodyti savus pasidalinimus + Rodyti mano žinutes + Rodyti asmenines žinutes + Atverti naršyklėje + Versti + Pagrindinis + Vietinė laiko skalė + Nutildyti naudotojai + Pagrindinio nutildyti naudotojai + Sekimo prašymai + Nustatymai + Nutildyti + Blokuoti + Pranešti + Ištrinti + Kopijuoti + Bendrinti + Miniatiūra + Automatinė + Pasirinktinė akcento spalva + Nustatykite temos spalvą pagal paskyrą. + Tamsi akcento spalva + Spalva, kuri bus taikoma šviesos temai. + Pasirinkite takelius + Išeiti + Šviesi akcento spalva + Rodyti savus atsakymus + Spalva, kuri bus taikoma tamsiai temai. + Naudotojo vardas + Nauji sekėjai + Pranešimai + Atsisiųsti + Užblokuoti naudotojai + Atsakymai + Privatumas + Atšaukti + Ne + From 7087f80c9ca2dbcaa6fcc4c9930cc259b1ec874a Mon Sep 17 00:00:00 2001 From: Vaclovas Intas Date: Tue, 25 Feb 2025 08:13:55 +0100 Subject: [PATCH 05/10] Translated using Weblate (Lithuanian) Currently translated at 4.9% (3 of 61 strings) Co-authored-by: Vaclovas Intas Translate-URL: https://hosted.weblate.org/projects/fedilab/description/lt/ Translation: Fedilab/description --- .../metadata/android/lt/full_description.txt | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/fdroid/fastlane/metadata/android/lt/full_description.txt diff --git a/src/fdroid/fastlane/metadata/android/lt/full_description.txt b/src/fdroid/fastlane/metadata/android/lt/full_description.txt new file mode 100644 index 00000000..dfdfb7a6 --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/lt/full_description.txt @@ -0,0 +1,23 @@ +Palaiko: +- „Mastodon“, „Peertube“, „Pixelfed“, „Misskey“, „GNU Social“, „Pleroma“ ir „Friendica“ + +Programa turi pažangių funkcijų: +- Sukurti gijas +- Daugelio paskyrų palaikymas +- Planuoti pranešimus iš įrenginio +- Sekti ir bendrauti su nuotoliniais serveriais +- Tarp paskyrų atliekami veiksmai ilgu paspaudimu +- Vertimo funkcija +- Kelios automatinio naujinimų parinktys + - Tiesioginiai pranešimai per „UnifiedPush“ (įskaitant „ntfy“ parduotuvėje „F-Droid“) + - Išlikti prisijungus tiesioginiams pranešimams + - Atidėti pranešimai (jungtis kas 30 sekundžių) +- Pakeisti „YouTube“ ir „Twitter“ nuorodas su nuorodomis į „Invidious“ ir „Nitter“ instancijas +- Pasirinktinės temos, importo / eksporto ir apibrėžimų nustatymas +- Importuoti ir eksportuoti programos duomenų bazę +- Jaustukų pcikeris su pasirinktiniais jaustukais +- Kelios paleidimo piktogramos +- Išplėstinė paleidyklės filtravimas +- Speciali meno laiko skalė mastoart žymei +- Eksportuoti įrašus +- Tinkinti URL bendrinimo funkciją, kad tiesiogiai bendrinti URL su kitomis paslaugomis From a2338c5fca7df9a0e2844746fa961932d1712e0b Mon Sep 17 00:00:00 2001 From: Vaclovas Intas Date: Tue, 25 Feb 2025 08:13:57 +0100 Subject: [PATCH 06/10] Translated using Weblate (Lithuanian) Currently translated at 24.7% (294 of 1190 strings) Co-authored-by: Vaclovas Intas Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/lt/ Translation: Fedilab/Strings --- app/src/main/res/values-lt/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 2c526678..cbd048d5 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -78,4 +78,6 @@ Privatumas Atšaukti Ne + Paminėti + Nutildyti laiku From 04e18c7518a8bbf8c94a1c6c5ac58a16cd6b8d6f Mon Sep 17 00:00:00 2001 From: Vaclovas Intas Date: Tue, 25 Feb 2025 08:53:11 +0100 Subject: [PATCH 07/10] Translated using Weblate (Lithuanian) Currently translated at 25.9% (309 of 1190 strings) Co-authored-by: Vaclovas Intas Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/lt/ Translation: Fedilab/Strings --- app/src/main/res/values-lt/strings.xml | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index cbd048d5..e3c36c75 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -80,4 +80,35 @@ Ne Paminėti Nutildyti laiku + %d d. + + %d sekundė + %d sekundės + %d sekundžių + + + %d minutė + %d minutės + %d minučių + + + %d valanda + %d valandos + %d valandų + + + %d diena + %d dienos + %d dienų + + Licencija: + GNU GPL V3 + Šaltinio kodas: + Seka jus + Naujos žinutės + %1$s leidimas + %d sek. + %d min. + %d val. + Kūrėjas: From f93533f95b846506547d0bb65e630e11fa52488b Mon Sep 17 00:00:00 2001 From: sim Date: Tue, 25 Feb 2025 10:17:09 +0100 Subject: [PATCH 08/10] Remove useless exclude --- app/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a74d31dc..5f41e77d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,11 +102,7 @@ allprojects { dependencies { implementation 'org.unifiedpush.android:connector:3.0.4' - playstoreImplementation('org.unifiedpush.android:embedded-fcm-distributor:3.0.0') { - exclude group: 'com.google.firebase', module: 'firebase-core' - exclude group: 'com.google.firebase', module: 'firebase-analytics' - exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' - } + playstoreImplementation('org.unifiedpush.android:embedded-fcm-distributor:3.0.0') implementation 'androidx.appcompat:appcompat:1.7.0' From b26b10c651371278a011faf77518517e675594c0 Mon Sep 17 00:00:00 2001 From: sim Date: Tue, 25 Feb 2025 10:19:43 +0100 Subject: [PATCH 09/10] Always register push endpoint The mastodon server may remove the endpoint if the push server has been in an inconsistent state (returning a 404), or the endpoint may not be restored after a backup, or other edge cases --- .../mastodon/services/PushServiceImpl.java | 24 ++++--------------- app/src/main/res/values/strings.xml | 1 - 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java b/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java index a028ac06..34633fc7 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java +++ b/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java @@ -1,22 +1,14 @@ package app.fedilab.android.mastodon.services; -import static app.fedilab.android.mastodon.helper.Helper.TAG; - - -import android.content.SharedPreferences; - +import android.content.Context; import androidx.annotation.NonNull; -import androidx.preference.PreferenceManager; - import org.unifiedpush.android.connector.FailedReason; import org.unifiedpush.android.connector.PushService; import org.unifiedpush.android.connector.data.PushEndpoint; import org.unifiedpush.android.connector.data.PushMessage; -import app.fedilab.android.R; - import app.fedilab.android.mastodon.helper.NotificationsHelper; import app.fedilab.android.mastodon.helper.PushNotifications; @@ -49,17 +41,11 @@ public class PushServiceImpl extends PushService { @Override public void onNewEndpoint(@NonNull PushEndpoint pushEndpoint, @NonNull String slug) { - if (getApplicationContext() != null) { + Context context = getApplicationContext(); + if (context != null) { synchronized (this) { - SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - String storedEnpoint = sharedpreferences.getString(getApplicationContext().getString(R.string.SET_STORED_ENDPOINT) + slug, null); - if (storedEnpoint == null || !storedEnpoint.equals(pushEndpoint.getUrl())) { - PushNotifications - .registerPushNotifications(getApplicationContext(), pushEndpoint, slug); - SharedPreferences.Editor editor = sharedpreferences.edit(); - editor.putString(getApplicationContext().getString(R.string.SET_STORED_ENDPOINT) + slug, pushEndpoint.getUrl()); - editor.commit(); - } + PushNotifications + .registerPushNotifications(context, pushEndpoint, slug); } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 63f0a810..08a64db8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1169,7 +1169,6 @@ lingva.ml SET_TRANSLATOR_DOMAIN SET_TRANSLATOR - SET_STORED_ENDPOINT SET_TRANSLATOR_VERSION SET_TRANSLATOR_API_KEY From ec60b63c682f89e87b9de343c944709c9b2fd687 Mon Sep 17 00:00:00 2001 From: sim Date: Tue, 25 Feb 2025 10:20:03 +0100 Subject: [PATCH 10/10] Unregister push endpoint onUnregistered --- .../mastodon/helper/PushNotifications.java | 17 +++++++++++++++++ .../mastodon/services/PushServiceImpl.java | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java b/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java index 6721d12d..c996e4ff 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java @@ -45,6 +45,23 @@ import retrofit2.converter.gson.GsonConverterFactory; public class PushNotifications { + public static void unregisterPushNotifications(Context context, String slug) { + new Thread(() -> { + String[] slugArray = slug.split("@"); + BaseAccount accountDb = null; + try { + accountDb = new Account(context).getUniqAccount(slugArray[0], slugArray[1]); + } catch (DBException e) { + e.printStackTrace(); + } + + if (accountDb == null) { + return; + } + MastodonNotificationsService mastodonNotificationsService = init(context, accountDb.instance); + mastodonNotificationsService.deletePushsubscription(accountDb.token); + }); + } public static void registerPushNotifications(Context context, PushEndpoint pushEndpoint, String slug) { diff --git a/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java b/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java index 34633fc7..e00d624e 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java +++ b/app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java @@ -56,6 +56,13 @@ public class PushServiceImpl extends PushService { } @Override - public void onUnregistered(@NonNull String s) { + public void onUnregistered(@NonNull String slug) { + Context context = getApplicationContext(); + if (context != null) { + synchronized (this) { + PushNotifications + .unregisterPushNotifications(context, slug); + } + } } }