Commit 4c3e8b48 authored by Thomas's avatar Thomas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents 23b6aa4c 6d47a873

app/build.gradle

+1 −5
Original line number Diff line number Diff line
@@ -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'

app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java

+17 −0
Original line number Diff line number Diff line
@@ -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) {

app/src/main/java/app/fedilab/android/mastodon/services/PushServiceImpl.java

+13 −20
Original line number Diff line number Diff line 
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();

                }

                        .registerPushNotifications(context, pushEndpoint, slug);

            }

        }

    }
@@ -70,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);

            }

        }

    }

}

app/src/main/res/values-lt/strings.xml

0 → 100644
+114 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <string name="action_about">Apie</string>

    <string name="action_about_instance">Apie serverį</string>

    <string name="action_cache">Podėlis</string>

    <string name="action_logout">Atsijungti</string>

    <string name="close">Užverti</string>

    <string name="yes">Taip</string>

    <string name="download_file">Atsisiųsti %1$s</string>

    <string name="save_over">Medija išsaugota</string>

    <string name="download_from" formatted="false">Failas: %1$s</string>

    <string name="password">Slaptažodis</string>

    <string name="email">El. paštas</string>

    <string name="accounts">Paskyros</string>

    <string name="toots">Žinutės</string>

    <string name="tags">Žymės</string>

    <string name="save">Išsaugoti</string>

    <string name="instance">Serveris</string>

    <string name="instance_example">Serveris: mastodon.social</string>

    <string name="toast_account_changed" formatted="false">Dabar veikia su paskyra %1$s</string>

    <string name="add_account">Įtraukti paskyrą</string>

    <string name="clipboard">Žinutės turinys nukopijuotas į iškarpinę</string>

    <string name="clipboard_url">Žinutės URL nukopijuotas į iškarpinę</string>

    <string name="clipboard_version">Informacija nukopijuota į iškarpinę</string>

    <string name="tag_already_followed">Jau sekate šią žymę!</string>

    <string name="camera">Fotoaparatas</string>

    <string name="delete_all">Ištrinti viską</string>

    <string name="schedule">Planuoti</string>

    <string name="text_size">Teksto dydžiai</string>

    <string name="icon_size">Piktogramos dydžiai</string>

    <string name="next">Sekantis</string>

    <string name="previous">Ankstesnis</string>

    <string name="open_with">Atverti su</string>

    <string name="validate">Patvirtinti</string>

    <string name="media">Medija</string>

    <string name="share_with">Bendrinti su</string>

    <string name="shared_via">Bendrinta per „Fedilab‚</string>

    <string name="drafts">Juodraščiai</string>

    <string name="favourite">Mėgstami</string>

    <string name="mention">Paminėjimai</string>

    <string name="reblog">Pasidalinimai</string>

    <string name="show_boosts">Rodyti pasidalinimus</string>

    <string name="show_replies">Rodyti atsakymus</string>

    <string name="show_self_boosts">Rodyti savus pasidalinimus</string>

    <string name="show_my_messages">Rodyti mano žinutes</string>

    <string name="show_privates">Rodyti asmenines žinutes</string>

    <string name="action_open_in_web">Atverti naršyklėje</string>

    <string name="translate">Versti</string>

    <string name="home_menu">Pagrindinis</string>

    <string name="local_menu">Vietinė laiko skalė</string>

    <string name="muted_menu">Nutildyti naudotojai</string>

    <string name="muted_menu_home">Pagrindinio nutildyti naudotojai</string>

    <string name="follow_request">Sekimo prašymai</string>

    <string name="settings">Nustatymai</string>

    <string name="more_action_1">Nutildyti</string>

    <string name="more_action_2">Blokuoti</string>

    <string name="more_action_3">Pranešti</string>

    <string name="more_action_4">Ištrinti</string>

    <string name="more_action_5">Kopijuoti</string>

    <string name="more_action_6">Bendrinti</string>

    <string name="thumbnail">Miniatiūra</string>

    <string name="auto">Automatinė</string>

    <string name="set_custom_accent">Pasirinktinė akcento spalva</string>

    <string name="set_custom_accent_indication">Nustatykite temos spalvą pagal paskyrą.</string>

    <string name="set_custom_accent_dark_value">Tamsi akcento spalva</string>

    <string name="set_custom_accent_value_light_description">Spalva, kuri bus taikoma šviesos temai.</string>

    <string name="track_selection_title">Pasirinkite takelius</string>

    <string name="exit">Išeiti</string>

    <string name="set_custom_accent_light_value">Šviesi akcento spalva</string>

    <string name="show_self_replies">Rodyti savus atsakymus</string>

    <string name="set_custom_accent_value_dark_description">Spalva, kuri bus taikoma tamsiai temai.</string>

    <string name="username">Naudotojo vardas</string>

    <string name="follow">Nauji sekėjai</string>

    <string name="notifications">Pranešimai</string>

    <string name="download">Atsisiųsti</string>

    <string name="blocked_menu">Užblokuoti naudotojai</string>

    <string name="replies">Atsakymai</string>

    <string name="action_privacy">Privatumas</string>

    <string name="cancel">Atšaukti</string>

    <string name="no">Ne</string>

    <string name="more_action_7">Paminėti</string>

    <string name="more_action_8">Nutildyti laiku</string>

    <string name="date_day">%d d.</string>

    <plurals name="date_seconds_polls">

        <item quantity="one">%d sekundė</item>

        <item quantity="few">%d sekundės</item>

        <item quantity="other">%d sekundžių</item>

    </plurals>

    <plurals name="date_minutes_polls">

        <item quantity="one">%d minutė</item>

        <item quantity="few">%d minutės</item>

        <item quantity="other">%d minučių</item>

    </plurals>

    <plurals name="date_hours_polls">

        <item quantity="one">%d valanda</item>

        <item quantity="few">%d valandos</item>

        <item quantity="other">%d valandų</item>

    </plurals>

    <plurals name="date_day_polls">

        <item quantity="one">%d diena</item>

        <item quantity="few">%d dienos</item>

        <item quantity="other">%d dienų</item>

    </plurals>

    <string name="about_license">Licencija:</string>

    <string name="about_license_action">GNU GPL V3</string>

    <string name="about_code">Šaltinio kodas:</string>

    <string name="follows_you">Seka jus</string>

    <string name="new_messages">Naujos žinutės</string>

    <string name="about_vesrion">%1$s leidimas</string>

    <string name="date_seconds">%d sek.</string>

    <string name="date_minutes">%d min.</string>

    <string name="date_hours">%d val.</string>

    <string name="about_developer">Kūrėjas:</string>

</resources>

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

+0 −1
Original line number Diff line number Diff line
@@ -1169,7 +1169,6 @@ 
    <string name="SET_TRANSLATOR_HOST_LINGVA" translatable="false">lingva.ml</string>

    <string name="SET_TRANSLATOR_DOMAIN" translatable="false">SET_TRANSLATOR_DOMAIN</string>

    <string name="SET_TRANSLATOR" translatable="false">SET_TRANSLATOR</string>

    <string name="SET_STORED_ENDPOINT" translatable="false">SET_STORED_ENDPOINT</string>

    <string name="SET_TRANSLATOR_VERSION" translatable="false">SET_TRANSLATOR_VERSION</string>



    <string name="SET_TRANSLATOR_API_KEY" translatable="false">SET_TRANSLATOR_API_KEY</string>