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

Commit 8e6bb9d1 authored by Nishant Dande's avatar Nishant Dande
Browse files

Merge branch 'main' into 1346-connect-anonymous-api-with-ui 

# Conflicts:
#	app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
#	app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
parents 2a949b2f 2f736f92

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ plugins { 


def versionMajor = 2

def versionMinor = 6

def versionPatch = 4

def versionPatch = 5



def getGitHash = { ->

    def stdOut = new ByteArrayOutputStream()

app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ class SearchViewModel @Inject constructor( 
                return@launch

            }



            if (authData == null) {

                return@launch

            }



            nextSubBundle = null

            fetchGplayData(query)

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -161,4 +161,7 @@ 
\n\t• Micro-Targeting abzuschwächen

\n\t• die Auswirkungen zu begrenzen, falls dieses Konto von Google eingeschränkt wird</string>

    <string name="free_space_for_update">Bitte %1$s Speicherplatz auf diesem Gerät freimachen, damtit die neueste Aktualisierung installiert werden kann.</string>

    <string name="checking_updates">Aktualisierungen werden überprüft …</string>

    <string name="too_many_requests_desc">Das anonyme Konto, das von Ihnen genutzt wird, ist nicht verfügbar. Bitte erneuern (refresh) Sie die Sitzung, um ein neues anonymes Konto zu erhalten.</string>

    <string name="refresh_session">SITZUNG ERNEUERN</string>

</resources>
 
 No newline at end of file

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

+2 −0
Original line number Diff line number Diff line
@@ -163,4 +163,6 @@ 
    <string name="request_exodus_report_confirm_dialog">Með því að smella á \"<xliff:g id="ok">%1$s</xliff:g>\" mun opnast flipi í vafranum þínum mep heiti pakkans forútfylltu.&lt;br /&gt;&lt;br /&gt;Smelltu á \"Perform analysis\" til að hefja greiningu með Exodus.&lt;br /&gt;&lt;br /&gt;Þegar hnappurinn \"See the report\" birtist (tíminn sem það tekur fer eftir forritinu) geturðu lokað flipanum og snúið til baka í lýsingu forritsins á <xliff:g id="app_name">%2$s</xliff:g> þar sem þú ættir að sjá gagnaleyndareinkunnina (Privacy Score). Stundum mistekst Exodus að greina forrit.&lt;br /&gt;&lt;br /&gt;ATH: það getur tekið allt að 10 mínútur fyrir einkunnina að birtast í lýsingunni á forritinu.</string>

    <string name="refresh_session">ENDURLESA SETU</string>

    <string name="too_many_requests_desc">Nafnlausi aðgangurinn sem þú ert að nota er ekki tiltækur. Endurlestu setuna til að fá annann.</string>

    <string name="free_space_for_update">Losaðu um %1$s pláss á símanum þínum til að fá nýjustu uppfærslur.</string>

    <string name="checking_updates">Athuga með uppfærslur...</string>

</resources>
 
 No newline at end of file