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

Commit 42c6dcc1 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '2683-main-pwa_icon' into 'main' 

Revert "feat: add murena.io PWA"

See merge request !560
parents 8933a843 4084c958

app/src/main/AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -100,11 +100,6 @@ 
            android:foregroundServiceType="dataSync">

        </service>



        <service

            android:name=".utils.LocalPWAInstaller"

            android:foregroundServiceType="dataSync">

        </service>



        <receiver

            android:name="foundation.e.apps.install.download.DownloadManagerBR"

            android:exported="true">

app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class ApplicationDataManager @Inject constructor( 
            application.package_name.isBlank() -> FilterLevel.UNKNOWN

            !application.isFree && application.price.isBlank() -> FilterLevel.UI

            application.source == Source.PWA || application.source == Source.OPEN_SOURCE -> FilterLevel.NONE

            application.source == Source.SYSTEM_APP || application.source == Source.LOCAL_PWA -> FilterLevel.NONE

            application.source == Source.SYSTEM_APP -> FilterLevel.NONE

            !isRestricted(application) -> FilterLevel.NONE

            application.originalSize == 0L -> FilterLevel.UI

            else -> FilterLevel.NONE

app/src/main/java/foundation/e/apps/data/application/downloadInfo/DownloadInfoApiImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class DownloadInfoApiImpl @Inject constructor( 
                updateDownloadInfoFromGplay(appInstall, list)

            }



            Source.SYSTEM_APP, Source.LOCAL_PWA -> {

            Source.SYSTEM_APP -> {

                return // nothing to do as downloadURLList is already set

            }

        }

app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class HomeApiImpl @Inject constructor( 
                Source.PLAY_STORE -> ("GPlay home loading error\n" + apiStatus.message).trim()

                Source.SYSTEM_APP -> ("Gitlab home not allowed\n" + apiStatus.message).trim()

                Source.OPEN_SOURCE -> ("Open Source home loading error\n" + apiStatus.message).trim()

                Source.PWA, Source.LOCAL_PWA -> ("PWA home loading error\n" + apiStatus.message).trim()

                Source.PWA -> ("PWA home loading error\n" + apiStatus.message).trim()

            }

        }

    }

app/src/main/java/foundation/e/apps/data/enums/Source.kt

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package foundation.e.apps.data.enums 


enum class Source {

    OPEN_SOURCE,

    LOCAL_PWA,

    PWA,

    SYSTEM_APP,

    PLAY_STORE;
@@ -38,7 +37,6 @@ enum class Source { 
            return when (source) {

                "Open Source" -> OPEN_SOURCE

                "PWA" -> PWA

                "Local PWA" -> LOCAL_PWA

                "SYSTEM_APP" -> SYSTEM_APP

                else -> PLAY_STORE

            }