Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0503a2d0 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'issue_1909' into 'master' 

Issue 1909

See merge request e/apps/apps!38
parents f1203aa4 5707e6f1

app/src/main/java/foundation/e/apps/updates/UpdatesNotifier.kt

+2 −4
Original line number Diff line number Diff line
@@ -53,15 +53,13 @@ class UpdatesNotifier { 
                    numberOfApps))

        }

        if (installAutomatically) {

            notificationBuilder.setContentText(context.getString(R.string.updates_notification_text,

                    Constants.AUTOMATICALLY_INSTALL_UPDATES))

            notificationBuilder.setContentText(context.getString(R.string.AUTOMATICALLY_INSTALL_updates_notification_text))

            if (unmeteredNetworkOnly && !isConnectedToUnmeteredNetwork) {

                notificationBuilder.setSubText(context

                        .getString(R.string.updates_notification_unmetered_network_warning))

            }

        } else {

            notificationBuilder.setContentText(context.getString(R.string.updates_notification_text,

                    Constants.MANUALLY_INSTALL_UPDATES))

            notificationBuilder.setContentText(context.getString(R.string.MANUALLY_INSTALL_updates_notification_text))

        }

        notificationBuilder.setContentIntent(getClickIntent(context))

        notificationBuilder.setAutoCancel(true)

app/src/main/java/foundation/e/apps/utils/Constants.kt

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ object Constants { 
    const val UPDATES_NOTIFICATION_ID = 76

    const val UPDATES_NOTIFICATION_CHANNEL_ID = "updates_notification"

    const val UPDATES_NOTIFICATION_CHANNEL_TITLE = "App updates"

    const val AUTOMATICALLY_INSTALL_UPDATES = "will"

    const val MANUALLY_INSTALL_UPDATES = "will not"

    const val UPDATES_NOTIFICATION_CLICK_EXTRA = "updates_notification_click_extra"



}

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

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ 
    <string name="preference_update_interval_default">24</string>

    <string name="preference_updates_title">Aktualisierungen</string>

    <string name="updates_notification_unmetered_network_warning">Warten auf ein unbegrenztes Netzwerk</string>

    <string name="updates_notification_text">App-Aktualisierungen %1$s werden automatisch installiert</string>



    <string name="AUTOMATICALLY_INSTALL_updates_notification_text">App-Updates werden automatisch installiert</string>

    <string name="MANUALLY_INSTALL_updates_notification_text">App-Updates werden nicht automatisch installiert</string>



    <plurals name="updates_notification_title">

        <item quantity="one">%1$d App-Aktualisierung ist verfügbar</item>

        <item quantity="other">%1$d App-Aktualisierungen sind verfügbar</item>

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

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
    <string name="preference_update_install_automatically_title">Automatikoki instalatu eguneraketak</string>

    <string name="preference_update_interval_default">24</string>

    <string name="preference_updates_title">Eguneraketak</string>

    <string name="updates_notification_text">%1$s aplikazioaren eguneraketak automatikoki instalatuko dira</string>



    <string name="AUTOMATICALLY_INSTALL_updates_notification_text">Aplikazioen eguneratzeak automatikoki instalatuko dira</string>

    <string name="MANUALLY_INSTALL_updates_notification_text">Aplikazioen eguneratzeak ez dira automatikoki instalatuko</string>

    <plurals name="updates_notification_title">

        <item quantity="one">Aplikazio-eguneraketa %1$d eskuragarri dago</item>

        <item quantity="other">%1$d aplikazio-eguneraketa eskuragarri daude</item>

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

+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ 
    <string name="preference_update_interval_default">24</string>

    <string name="preference_updates_title">Mises à jour</string>

    <string name="updates_notification_unmetered_network_warning">En attente d\'un réseau non-limité</string>

    <string name="updates_notification_text">Les mises à jour d\'application %1$s être installées automatiquement</string>



    <string name="AUTOMATICALLY_INSTALL_updates_notification_text">Les mises à jour de l application seront installées automatiquement</string>

    <string name="MANUALLY_INSTALL_updates_notification_text">Les mises à jour de l application ne seront pas installées automatiquement</string>

    <plurals name="updates_notification_title">

        <item quantity="one">%1$d mise à jour disponible</item>

        <item quantity="other">%1$d mises à jour disponibles</item>