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

Commit f855b3ab authored by Fynn Godau's avatar Fynn Godau
Browse files

Move profile provider to `play-services-core-package`

parent dfa282eb

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

+1 −8
Original line number Diff line number Diff line
@@ -3,19 +3,12 @@ 
  ~ SPDX-FileCopyrightText: 2020, microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->

<manifest xmlns:tools="http://schemas.android.com/tools"

    xmlns:android="http://schemas.android.com/apk/res/android">

<manifest xmlns:android="http://schemas.android.com/apk/res/android">



    <application>

        <provider

            android:name="org.microg.gms.settings.SettingsProvider"

            android:authorities="${applicationId}.microg.settings"

            android:exported="false" />



        <provider

            android:name="org.microg.gms.profile.ProfileProvider"

            android:authorities="${applicationId}.microg.profile"

            android:exported="true"

            tools:ignore="ExportedContentProvider" />

    </application>

</manifest>

play-services-base/core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ object ProfileManager { 
        }

    }.getOrDefault(false)



    internal fun getActiveProfileData(context: Context): Map<String, String> =

    fun getActiveProfileData(context: Context): Map<String, String> =

        getProfileData(context, getProfile(context), getRealData())



    private fun getProfileData(context: Context, profile: String, realData: Map<String, String>): Map<String, String> {

play-services-core/build.gradle

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



    implementation project(':play-services-core:microg-ui-tools') // deprecated

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

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



    implementation project(':play-services-appinvite')

play-services-core/package/build.gradle

0 → 100644
+43 −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 {

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

}



android {

    namespace "org.microg.gms.core.pkg"



    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName version

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    sourceSets {

        main {

            java.srcDirs = ['src/main/kotlin']

        }

    }



    lintOptions {

        disable 'MissingTranslation'

    }



    compileOptions {

        sourceCompatibility = 1.8

        targetCompatibility = 1.8

    }



    kotlinOptions {

        jvmTarget = 1.8

    }

}

play-services-core/package/src/main/AndroidManifest.xml

0 → 100644
+15 −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 xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools">



    <application>

        <provider

            android:name="org.microg.gms.profile.ProfileProvider"

            android:authorities="${applicationId}.microg.profile"

            android:exported="true"

            tools:ignore="ExportedContentProvider" />

    </application>

</manifest>