fixed missing resources

This commit is contained in:
X1nto 2020-07-29 10:07:45 +04:00
parent 7cf14ca401
commit 9f08f8cc15
10 changed files with 159 additions and 3 deletions

View File

@ -14,7 +14,6 @@ import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import org.microg.gms.checkin.CheckinPrefs import org.microg.gms.checkin.CheckinPrefs
import org.microg.gms.gcm.GcmPrefs import org.microg.gms.gcm.GcmPrefs
import org.microg.gms.snet.SafetyNetPrefs
class ProvisionService : LifecycleService() { class ProvisionService : LifecycleService() {
private fun Bundle.getBooleanOrNull(key: String): Boolean? { private fun Bundle.getBooleanOrNull(key: String): Boolean? {
@ -31,7 +30,6 @@ class ProvisionService : LifecycleService() {
intent?.extras?.getBooleanOrNull("checkin_enabled")?.let { CheckinPrefs.setEnabled(this@ProvisionService, it) } intent?.extras?.getBooleanOrNull("checkin_enabled")?.let { CheckinPrefs.setEnabled(this@ProvisionService, it) }
intent?.extras?.getBooleanOrNull("gcm_enabled")?.let { GcmPrefs.setEnabled(this@ProvisionService, it) } intent?.extras?.getBooleanOrNull("gcm_enabled")?.let { GcmPrefs.setEnabled(this@ProvisionService, it) }
intent?.extras?.getBooleanOrNull("safetynet_enabled")?.let { SafetyNetPrefs.get(this@ProvisionService).isEnabled = it }
// What else? // What else?
delay(2 * 1000) // Wait 2 seconds to give provisioning some extra time delay(2 * 1000) // Wait 2 seconds to give provisioning some extra time

View File

@ -101,6 +101,8 @@ Dies kann einige Minuten dauern."</string>
<string name="gcm_unregister_confirm_message">Einige Apps registrieren sich nicht automatisch erneut und haben keine Möglichkeit dies manuell anzustoßen. Diese Apps funktionieren eventuell nach dem abmelden nicht mehr richtig.\nFortsetzen?</string> <string name="gcm_unregister_confirm_message">Einige Apps registrieren sich nicht automatisch erneut und haben keine Möglichkeit dies manuell anzustoßen. Diese Apps funktionieren eventuell nach dem abmelden nicht mehr richtig.\nFortsetzen?</string>
<string name="gcm_unregister_after_deny_message">Du hast einer App die Erlaubnis der Registrierung entzogen, die bereits registriert ist.\nWillst du diese App jetzt auch abmelden damit sie zukünftig keine Push-Nachrichten erhält?</string> <string name="gcm_unregister_after_deny_message">Du hast einer App die Erlaubnis der Registrierung entzogen, die bereits registriert ist.\nWillst du diese App jetzt auch abmelden damit sie zukünftig keine Push-Nachrichten erhält?</string>
<string name="gcm_messages_counter">Nachrichten: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string> <string name="gcm_messages_counter">Nachrichten: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string>
<string name="gcm_network_state_disconnected">Nicht verbunden</string>
<string name="gcm_network_state_connected">Verbunden seit <xliff:g example="2 hours ago">%1$s</xliff:g></string>
<string name="pref_snet_status_official_info">offizieller Server</string> <string name="pref_snet_status_official_info">offizieller Server</string>
<string name="pref_snet_status_third_party_info">Dritt-Server</string> <string name="pref_snet_status_third_party_info">Dritt-Server</string>

View File

@ -99,5 +99,7 @@ Ceci peut prendre plusieurs minutes."</string>
<string name="gcm_unregister_confirm_message">Certaines applications ne se réenregistrent pas et/ou ne fournisse pas de moyens de le faire manuellement. Ces applications peuvent ne plus fonctionner correctement après le désenregistrement.\nContinuer ?</string> <string name="gcm_unregister_confirm_message">Certaines applications ne se réenregistrent pas et/ou ne fournisse pas de moyens de le faire manuellement. Ces applications peuvent ne plus fonctionner correctement après le désenregistrement.\nContinuer ?</string>
<string name="gcm_unregister_after_deny_message">Vous avez empêché une application déjà enregistrée de senregistrer pour recevoir des notifications push.\nVoulez-vous la désenregistrer maintenant pour quelle ne reçoive plus de notifications push à lavenir ?</string> <string name="gcm_unregister_after_deny_message">Vous avez empêché une application déjà enregistrée de senregistrer pour recevoir des notifications push.\nVoulez-vous la désenregistrer maintenant pour quelle ne reçoive plus de notifications push à lavenir ?</string>
<string name="gcm_messages_counter">Messages : <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> octets)</string> <string name="gcm_messages_counter">Messages : <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> octets)</string>
<string name="gcm_network_state_disconnected">Déconnecté</string>
<string name="gcm_network_state_connected">Connecté depuis <xliff:g example="2 hours ago">%1$s</xliff:g></string>
</resources> </resources>

View File

@ -111,7 +111,8 @@ Questa operazione può richiedere alcuni minuti."</string>
<string name="gcm_unregister_confirm_message">Alcune applicazioni non rinnovano automaticamente la registrazione e/o non forniscono un\'opzione per farlo manualmente. Queste applicazioni potrebbero non funzionare correttamente a seguito della de-registrazione.\nContinuare?</string> <string name="gcm_unregister_confirm_message">Alcune applicazioni non rinnovano automaticamente la registrazione e/o non forniscono un\'opzione per farlo manualmente. Queste applicazioni potrebbero non funzionare correttamente a seguito della de-registrazione.\nContinuare?</string>
<string name="gcm_unregister_after_deny_message">Hai negato ad una applicazione già registrata di registrarsi alle notifiche push.\nDesideri de-registrarla così che non riceva più notifiche push in futuro?</string> <string name="gcm_unregister_after_deny_message">Hai negato ad una applicazione già registrata di registrarsi alle notifiche push.\nDesideri de-registrarla così che non riceva più notifiche push in futuro?</string>
<string name="gcm_messages_counter">Messaggi: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string> <string name="gcm_messages_counter">Messaggi: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string>
<string name="gcm_network_state_disconnected">Disconnesso</string>
<string name="gcm_network_state_connected">Connesso da <xliff:g example="2 hours ago">%1$s</xliff:g></string>
<string name="pref_snet_status_official_info">Server ufficiale</string> <string name="pref_snet_status_official_info">Server ufficiale</string>
<string name="pref_snet_status_third_party_info">Server di terze parti</string> <string name="pref_snet_status_third_party_info">Server di terze parti</string>
<string name="pref_snet_status_self_signed_info">Certificato auto-firmato</string> <string name="pref_snet_status_self_signed_info">Certificato auto-firmato</string>

View File

@ -88,5 +88,7 @@ Isso pode demorar alguns minutos."</string>
<string name="gcm_unregister_confirm_message">Algumas aplicações não registam automaticamente e/ou não fornecem uma opção para fazê-lo manualmente. Esses aplicativos podem não funcionar corretamente após o cancelamento do registro.\nContinuar?</string> <string name="gcm_unregister_confirm_message">Algumas aplicações não registam automaticamente e/ou não fornecem uma opção para fazê-lo manualmente. Esses aplicativos podem não funcionar corretamente após o cancelamento do registro.\nContinuar?</string>
<string name="gcm_unregister_after_deny_message">Você negou um app para se registrar para notificações push que já está registrado.\nDeseja cancelar o registo agora para que não receba mensagens de envio no futuro?</string> <string name="gcm_unregister_after_deny_message">Você negou um app para se registrar para notificações push que já está registrado.\nDeseja cancelar o registo agora para que não receba mensagens de envio no futuro?</string>
<string name="gcm_messages_counter">Mensagens: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string> <string name="gcm_messages_counter">Mensagens: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string>
<string name="gcm_network_state_disconnected">Desconectado</string>
<string name="gcm_network_state_connected">Conectado desde <xliff:g example="2 hours ago">%1$s</xliff:g></string>
</resources> </resources>

View File

@ -81,6 +81,9 @@ This can take a couple of minutes."</string>
<string name="prefcat_google_services">Google Services</string> <string name="prefcat_google_services">Google Services</string>
<string name="pref_more_settings">More</string> <string name="pref_more_settings">More</string>
<string name="checkin_not_registered">Not registered</string>
<string name="checkin_last_registration">Last registration: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
<string name="cond_gcm_bat_title">Battery optimizations enabled</string> <string name="cond_gcm_bat_title">Battery optimizations enabled</string>
<string name="cond_gcm_bat_summary">You enabled Google Cloud Messaging but have battery optimizations active for microG Services Core. For push notifications to arrive you should ignore battery optimizations.</string> <string name="cond_gcm_bat_summary">You enabled Google Cloud Messaging but have battery optimizations active for microG Services Core. For push notifications to arrive you should ignore battery optimizations.</string>
<string name="cond_gcm_bat_action">Ignore optimizations</string> <string name="cond_gcm_bat_action">Ignore optimizations</string>
@ -113,6 +116,8 @@ This can take a couple of minutes."</string>
<string name="gcm_unregister_confirm_message">Some apps do not automatically re-register and/or do not provide an option to do so manually. These apps might not work correctly after unregistering.\nContinue?</string> <string name="gcm_unregister_confirm_message">Some apps do not automatically re-register and/or do not provide an option to do so manually. These apps might not work correctly after unregistering.\nContinue?</string>
<string name="gcm_unregister_after_deny_message">You denied an app to register for push notifications that is already registered.\nDo you want to unregister it now so it does not receive push messages in the future?</string> <string name="gcm_unregister_after_deny_message">You denied an app to register for push notifications that is already registered.\nDo you want to unregister it now so it does not receive push messages in the future?</string>
<string name="gcm_messages_counter">Messages: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string> <string name="gcm_messages_counter">Messages: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string>
<string name="gcm_network_state_disconnected">Disconnected</string>
<string name="gcm_network_state_connected">Connected since <xliff:g example="2 hours ago">%1$s</xliff:g></string>
<string name="prefcat_push_networks_title">Networks to use for push notifications</string> <string name="prefcat_push_networks_title">Networks to use for push notifications</string>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2017, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<PreferenceCategory
android:key="prefcat_device_registration_status"
android:layout="@layout/preference_category_no_label">
<Preference
android:key="pref_device_registration_status"
android:selectable="false"
android:title="@string/pref_info_status"
tools:summary="Last registration: 13 hours ago" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_category_no_label">
<Preference
android:icon="@drawable/ic_info_outline"
android:selectable="false"
android:summary="@string/pref_checkin_enable_summary" />
</PreferenceCategory>
</PreferenceScreen>

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:title="Push notifications">
<PreferenceCategory
android:key="prefcat_push_apps"
android:title="@string/prefcat_push_apps_title">
<Preference
android:enabled="false"
android:key="pref_push_apps_none"
android:title="@string/list_no_item_none"
tools:isPreferenceVisible="true" />
<Preference
android:icon="@drawable/ic_expand_apps"
android:key="pref_push_apps_all"
android:order="5"
android:title="@string/list_item_see_all" />
</PreferenceCategory>
<PreferenceCategory
android:key="prefcat_push_status"
android:layout="@layout/preference_category_no_label">
<Preference
android:key="pref_push_status"
android:selectable="false"
android:title="Status"
tools:summary="Connected since 15 minutes ago" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_category_no_label">
<Preference
android:icon="@drawable/ic_info_outline"
android:selectable="false"
android:summary="@string/pref_gcm_enable_mcs_summary" />
</PreferenceCategory>
</PreferenceScreen>

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:title="@string/prefcat_push_apps_title">
<Preference
android:key="pref_push_apps_all_progress"
android:layout="@layout/preference_progress_bar"
app:allowDividerBelow="false" />
<PreferenceCategory
android:key="prefcat_push_apps_registered"
android:title="@string/prefcat_push_apps_registered_title"
app:isPreferenceVisible="false"
tools:isPreferenceVisible="true">
<Preference
android:enabled="false"
android:key="pref_push_apps_registered_none"
android:title="@string/list_no_item_none"
app:isPreferenceVisible="false"
tools:isPreferenceVisible="true" />
</PreferenceCategory>
<PreferenceCategory
android:key="prefcat_push_apps_unregistered"
android:title="@string/prefcat_push_apps_unregistered_title"
app:isPreferenceVisible="false"
tools:isPreferenceVisible="true">
<Preference
android:enabled="false"
android:key="pref_push_apps_unregistered_none"
android:title="@string/list_no_item_none"
app:isPreferenceVisible="false"
tools:isPreferenceVisible="true" />
</PreferenceCategory>
</PreferenceScreen>

View File

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<PreferenceCategory
android:key="prefcat_push_app_settings"
android:layout="@layout/preference_category_no_label">
<SwitchPreference
android:defaultValue="true"
android:key="pref_push_app_allow_register"
android:persistent="false"
android:summary="@string/pref_push_app_allow_register_summary"
android:title="@string/pref_push_app_allow_register_title" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_push_app_wake_for_delivery"
android:persistent="false"
android:summary="@string/pref_push_app_wake_for_delivery_summary"
android:title="@string/pref_push_app_wake_for_delivery_title" />
</PreferenceCategory>
<PreferenceCategory
android:key="prefcat_push_app_unregister"
android:layout="@layout/preference_category_no_label">
<Preference
android:key="pref_push_app_unregister"
android:title="@string/gcm_unregister_app" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_category_no_label">
<Preference
android:key="pref_push_app_status"
android:selectable="false"
tools:summary="Messages: 1000 (37 MB)\nLast message: 22 min ago\nRegistered since: 3 month ago" />
</PreferenceCategory>
</PreferenceScreen>