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

Commit 0553e3d0 authored by Mohit Mali's avatar Mohit Mali
Browse files

Resolve crash on rotation of app and Implemented change for showing microG in... 

Resolve crash on rotation of app and Implemented change for showing microG in drop down suggestions.
parent 81bed8ec

app/src/main/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
        android:theme="@style/AppTheme">

        <!--        <activity android:name=".application.PwaInstaller"/>-->

        <activity android:name=".settings.AppRequestActivity" />

        <activity android:name=".MainActivity">

        <activity android:name=".MainActivity"

            android:configChanges="orientation|screenSize|keyboardHidden">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

app/src/main/java/foundation/e/apps/search/model/SearchModel.kt

+4 −3
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ class SearchModel : SearchModelInterface { 
    val suggestionList = MutableLiveData<ArrayList<String>>()

    val applicationList = MutableLiveData<ArrayList<Application>>()

    var screenError = MutableLiveData<Error>()

    private var applicationManager: ApplicationManager? = null

    lateinit var applicationManager: ApplicationManager

    private var pageNumber = 0

    private lateinit var searchQuery: String

    private lateinit var context: Context

    private var error: Error? = null



    override fun initialise(applicationManager: ApplicationManager) {

        this.applicationManager = applicationManager
@@ -86,7 +87,7 @@ class SearchModel : SearchModelInterface { 
    override fun onSearchComplete(error: Error?, applicationList: ArrayList<Application>) {



        if (error == null) {

            if (searchQuery.equals("microg", true)) {

            if ("microG Exposure Notification version".contains(searchQuery, true)) {

                val categoryIntent = Intent(context, CategoryActivity::class.java)

                categoryIntent.putExtra(Constants.CATEGORY_KEY, Category("system_apps"))

                context.startActivity(categoryIntent)

app/src/main/java/foundation/e/apps/search/model/SearchSuggestionsTask.kt

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package foundation.e.apps.search.model 


import android.content.Context

import android.os.AsyncTask

import android.util.Log

import foundation.e.apps.api.AllAppsSearchRequest

import foundation.e.apps.applicationmanager.ApplicationManager

import foundation.e.apps.utils.Constants
@@ -50,6 +51,9 @@ class SearchSuggestionsTask(private val searchQuery: String, 
    }



    override fun onPostExecute(result: ArrayList<String>) {

        if ("microG Exposure Notification version".contains(searchQuery, true)) {

            result.add(0,"microG Exposure Notification version")

        }

        callback.onSearchSuggestionsRetrieved(searchQuery, result)

    }

}