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

Commit 71f0b0f7 authored by Nishant D's avatar Nishant D
Browse files

Merge branch '1347-improve-local-cache' into 'epic103-improve_app_lounge' 

Added basic structure for local storage

See merge request !320
parents 5b8c8542 6d2b03df

app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt

+6 −1
Original line number Diff line number Diff line
@@ -483,7 +483,12 @@ class FusedApiImpl @Inject constructor( 
    }



    override suspend fun getSearchSuggestions(query: String): List<SearchSuggestEntry> {

        return gplayRepository.getSearchSuggestions(query)

        var searchSuggesions = listOf<SearchSuggestEntry>()

        runCodeWithTimeout({

            searchSuggesions = gplayRepository.getSearchSuggestions(query)

        })



        return searchSuggesions

    }



    override suspend fun getOnDemandModule(

app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { 


    companion object {

        private const val PRIVACY_SCORE_SOURCE_CODE_URL =

            "https://gitlab.e.foundation/e/os/apps/-/blob/main/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt#L31"

            "https://gitlab.e.foundation/e/os/apps/-/blob/main/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt"

        private const val EXODUS_URL = "https://exodus-privacy.eu.org"

        private const val EXODUS_REPORT_URL = "https://reports.exodus-privacy.eu.org/"

        private const val PRIVACY_GUIDELINE_URL = "https://doc.e.foundation/privacy_score"

app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ class ApplicationDialogFragment() : DialogFragment() { 
        val positiveButtonText =

            positiveButtonText?.ifEmpty { getString(R.string.ok) }

        val materialAlertDialogBuilder = MaterialAlertDialogBuilder(requireContext())

            .setTitle(Html.fromHtml(title, Html.FROM_HTML_MODE_COMPACT))

            .setMessage(Html.fromHtml(message, Html.FROM_HTML_MODE_COMPACT))

            .setTitle(Html.fromHtml(title ?: "", Html.FROM_HTML_MODE_COMPACT))

            .setMessage(Html.fromHtml(message ?: "", Html.FROM_HTML_MODE_COMPACT))

            .setPositiveButton(positiveButtonText) { _, _ ->

                positiveButtonAction?.invoke()

                this.dismiss()

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

+4 −0
Original line number Diff line number Diff line
@@ -162,4 +162,8 @@ 
    <string name="may_not_work_warning_message">Þvingun uppsetningar mun gerir þér kleift að sækja og setja hana upp, en tryggir ekki endilega að hún muni virka rétt.<br/><br/>Tilraunir til að setja upp óstuddan hugbúnað geta valdi hruni eða hægt á kerfinu.<br/><br/>Við erum að vinna í að bæta samhæfni við þetta forrit.</string>

    <string name="having_troubles">Einhver vandamál\?</string>

    <string name="proceed_to_google_login">Halda áfram yfir í Google-innskráningu</string>

    <string name="google_login_alert_message">Við mælum með því að notaður sé sértakur Google-reikningur til að:

\n

\n\t• minnka líkur á sérsniðnu snuðri (micro-targeting)

\n\t• minnka áhrifin sem takmörkun reikningsins af hálfu Google myndi hafa</string>

</resources>
 
 No newline at end of file

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

+6 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 
    <string name="download_automatically_message">L\'app verrà scaricata automaticamente su questo dispositivo</string>

    <string name="purchase_complete">Acquisto completato!</string>

    <string name="paid_app_anonymous_message">Le app a pagamento non possono essere installate in modalità anonima. Per installarle, accedi al tuo account Google.</string>

    <string name="dialog_cancel">ANNULLA</string>

    <string name="dialog_confirm">CONFERMA</string>

    <string name="dialog_paidapp_message">Facendo click su conferma, si accede alla pagina Google Play della app per completare l\'acquisto con il browser. Fai click su conferma per acquistare %1$s per %2$s.</string>

    <string name="dialog_title_paid_app">Acquista <b>%1$s</b></string>
@@ -161,4 +160,10 @@ 
    <string name="preference_update_apps_from_other_stores_title">Aggiorna le app installate da altri store</string>

    <string name="preference_update_apps_from_other_stores_description">Aggiorna le app installate da altri app store.

\nTali app proveremo ad aggiornarle dalla categoria app comuni e open source.</string>

    <string name="having_troubles">Problemi\?</string>

    <string name="proceed_to_google_login">Prosegui con l\'accesso a Google</string>

    <string name="google_login_alert_message">Consigliamo di utilizzare un account Google dedicato al fine di:

\n

\n\t• ridurre il micro-targeting

\n\t• limitare l\'impatto nel caso in cui l\'account venga bloccato da Google</string>

</resources>
 
 No newline at end of file