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

Commit 8a3669cb authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Remove /e/OS location system

parent da3fdb29

.gitignore

+0 −4
Original line number Diff line number Diff line
@@ -11,8 +11,4 @@ bin/ 
.classpath

.output/

.settings/

play-services-location/core/provider/.cxx/

play-services-location/core/provider/src/main/cpp/

play-services-location/core/provider/src/main/java/

credentials.properties

*keystore

.gitlab-ci.yml

+0 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ before_script: 
  - echo mapbox.enabled true >> local.properties

  - echo stadia.key $STADIA_KEY >> local.properties

  - echo modules.hms false >> local.properties

  - echo key=$LOCATION_TOTP_SECRET_PROD >> credentials.properties

  - echo url=$LOCATION_ENDPOINT_URL >> credentials.properties

  - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore

  - export TERM=dumb

  - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m"
@@ -35,7 +33,6 @@ build: 
  - *default_before_script

  - echo modules.nearby false >> local.properties

  script:

  - ./gradlew hideSecretFromPropertiesFile -PpropertiesFileName=credentials.properties -Ppackage=com.google.android.gms

  - ./gradlew assembleMapboxDefaultDebug assembleDefaultDebug

  - ./gradlew assembleMapboxDefaultRelease assembleDefaultRelease

  artifacts:
@@ -53,7 +50,6 @@ build-nearby: 
  - *default_before_script

  - echo modules.nearby true >> local.properties

  script:

  - ./gradlew hideSecretFromPropertiesFile -PpropertiesFileName=credentials.properties -Ppackage=com.google.android.gms

  - ./gradlew assembleMapboxDefaultDebug assembleDefaultDebug

  - ./gradlew assembleMapboxDefaultRelease assembleDefaultRelease

build.gradle

+0 −3
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ buildscript { 


    ext.androidBuildVersionTools = '34.0.0'



    ext.hiddenSecretVersion = '0.2.1'



    ext.appLoungeAuthDataVersion = '1.0.0'



    ext.androidMinSdk = 21
@@ -69,7 +67,6 @@ buildscript { 
        classpath "com.android.tools.build:gradle:$androidBuildGradleVersion"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

        classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"

        classpath "com.klaxit.hiddensecrets:HiddenSecretsPlugin:$hiddenSecretVersion"

    }

}

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt

+0 −2
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ object SettingsContract { 
        const val ICHNAEA_ENDPOINT = "location_ichnaea_endpoint"

        const val ONLINE_SOURCE = "location_online_source"

        const val ICHNAEA_CONTRIBUTE = "location_ichnaea_contribute"

        const val LOCATION_FROM_E = "location_ichnaea_from_e"



        val PROJECTION = arrayOf(

            WIFI_ICHNAEA,
@@ -264,7 +263,6 @@ object SettingsContract { 
            ICHNAEA_ENDPOINT,

            ONLINE_SOURCE,

            ICHNAEA_CONTRIBUTE,

            LOCATION_FROM_E,

        )

    }

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt

+0 −2
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ class SettingsProvider : ContentProvider() { 
            Location.ICHNAEA_ENDPOINT -> getSettingsString(key, null)

            Location.ONLINE_SOURCE -> getSettingsString(key, null)

            Location.ICHNAEA_CONTRIBUTE -> getSettingsBoolean(key, false)

            Location.LOCATION_FROM_E -> getSettingsBoolean(key, true)

            else -> throw IllegalArgumentException("Unknown key: $key")

        }

    }
@@ -354,7 +353,6 @@ class SettingsProvider : ContentProvider() { 
                Location.ICHNAEA_ENDPOINT -> (value as String).let { if (it.isBlank()) editor.remove(key) else editor.putString(key, it) }

                Location.ONLINE_SOURCE -> (value as? String?).let { if (it.isNullOrBlank()) editor.remove(key) else editor.putString(key, it) }

                Location.ICHNAEA_CONTRIBUTE -> editor.putBoolean(key, value as Boolean)

                Location.LOCATION_FROM_E -> editor.putBoolean(key, value as Boolean)

                else -> throw IllegalArgumentException("Unknown key: $key")

            }

        }