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

Unverified Commit ba8e0524 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Location: Move network location provider to independent module

parent 155d9f71

play-services-core/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ dependencies { 
    implementation project(':play-services-fido-core')

    implementation project(':play-services-gmscompliance-core')

    implementation project(':play-services-location-core')

    implementation project(':play-services-location-core-provider')

    withNearbyImplementation project(':play-services-nearby-core')

    implementation project(':play-services-oss-licenses-core')

    implementation project(':play-services-pay-core')

play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetFragment.kt

+0 −3
Original line number Diff line number Diff line
@@ -54,10 +54,7 @@ class SafetyNetFragment : PreferenceFragmentCompat() { 


    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

        addPreferencesFromResource(R.xml.preferences_safetynet)

    }



    @SuppressLint("RestrictedApi")

    override fun onBindPreferences() {

        switchBarPreference = preferenceScreen.findPreference("pref_safetynet_enabled") ?: switchBarPreference

        runAttest = preferenceScreen.findPreference("pref_safetynet_run_attest") ?: runAttest

        runReCaptcha = preferenceScreen.findPreference("pref_recaptcha_run_test") ?: runReCaptcha

play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt

+4 −4
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ class SettingsFragment : ResourceSettingsFragment() { 
            true

        }

        findPreference<Preference>(PREF_ABOUT)!!.summary = getString(R.string.about_version_str, AboutFragment.getSelfVersion(context))



        findPreference<Preference>(PREF_EXPOSURE)?.isVisible = NearbyPreferencesIntegration.isAvailable

        findPreference<Preference>(PREF_EXPOSURE)?.icon = NearbyPreferencesIntegration.getIcon(requireContext())

        findPreference<Preference>(PREF_EXPOSURE)?.summary = NearbyPreferencesIntegration.getExposurePreferenceSummary(requireContext())

    }



    override fun onResume() {
@@ -63,10 +67,6 @@ class SettingsFragment : ResourceSettingsFragment() { 


        findPreference<Preference>(PREF_CHECKIN)!!.setSummary(if (CheckinPreferences.isEnabled(requireContext())) R.string.service_status_enabled_short else R.string.service_status_disabled_short)

        findPreference<Preference>(PREF_SNET)!!.setSummary(if (SafetyNetPreferences.isEnabled(requireContext())) R.string.service_status_enabled_short else R.string.service_status_disabled_short)



        findPreference<Preference>(PREF_EXPOSURE)?.isVisible = NearbyPreferencesIntegration.isAvailable

        findPreference<Preference>(PREF_EXPOSURE)?.icon = NearbyPreferencesIntegration.getIcon(requireContext())

        findPreference<Preference>(PREF_EXPOSURE)?.summary = NearbyPreferencesIntegration.getExposurePreferenceSummary(context)

    }



    companion object {

play-services-location/core/base/build.gradle

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2023 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



apply plugin: 'com.android.library'

apply plugin: 'kotlin-android'



dependencies {

    api project(':play-services-location')

    implementation project(':play-services-base-core')

}



android {

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName version

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    sourceSets {

        main.java.srcDirs += 'src/main/kotlin'

    }



    compileOptions {

        sourceCompatibility = 1.8

        targetCompatibility = 1.8

    }

}

play-services-location/core/base/src/main/AndroidManifest.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ SPDX-FileCopyrightText: 2023 microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->

<manifest package="org.microg.gms.location.base" />