Merge pull request #154 from Oizaro/master

MicroG 0.2.21.212417
This commit is contained in:
KevinX8 2021-07-06 11:20:02 +01:00 committed by GitHub
commit 4c9230d279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 26 additions and 26 deletions

View File

@ -46,8 +46,8 @@ allprojects {
apply plugin: 'idea' apply plugin: 'idea'
group = 'org.microg.gms' group = 'org.microg.gms'
version = "0.2.20.212415" version = "0.2.21.212417"
ext.appVersionCode = 212415001 ext.appVersionCode = 212417001
ext.isReleaseVersion = false ext.isReleaseVersion = false
} }

View File

@ -94,8 +94,8 @@
<!-- Internal Settings --> <!-- Internal Settings -->
<provider <provider
android:name="org.microg.gms.settings.SettingsProvider" android:name="org.microg.mgms.settings.SettingsProvider"
android:authorities="org.microg.gms.settings" android:authorities="org.microg.mgms.settings"
android:exported="false" /> android:exported="false" />
<!-- Services Framework --> <!-- Services Framework -->
@ -105,7 +105,7 @@
android:authorities="com.mgoogle.android.gsf.gservices" android:authorities="com.mgoogle.android.gsf.gservices"
android:exported="true" /> android:exported="true" />
<provider <provider
android:name="org.microg.gms.settings.GoogleSettingsProvider" android:name="org.microg.mgms.settings.GoogleSettingsProvider"
android:authorities="com.mgoogle.settings" android:authorities="com.mgoogle.settings"
android:exported="true" /> android:exported="true" />
<provider <provider

View File

@ -24,7 +24,7 @@ import android.os.Build;
import android.util.Log; import android.util.Log;
import org.microg.gms.common.PackageUtils; import org.microg.gms.common.PackageUtils;
import org.microg.gms.settings.SettingsContract; import org.microg.mgms.settings.SettingsContract;
import java.io.IOException; import java.io.IOException;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.microg.gms.settings; package org.microg.mgms.settings;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;

View File

@ -1,8 +1,8 @@
package org.microg.gms.auth package org.microg.gms.auth
import android.content.Context import android.content.Context
import org.microg.gms.settings.SettingsContract import org.microg.mgms.settings.SettingsContract
import org.microg.gms.settings.SettingsContract.Auth import org.microg.mgms.settings.SettingsContract.Auth
object AuthPrefs { object AuthPrefs {

View File

@ -5,8 +5,8 @@
package org.microg.gms.checkin package org.microg.gms.checkin
import android.content.Context import android.content.Context
import org.microg.gms.settings.SettingsContract import org.microg.mgms.settings.SettingsContract
import org.microg.gms.settings.SettingsContract.CheckIn import org.microg.mgms.settings.SettingsContract.CheckIn
object CheckinPrefs { object CheckinPrefs {

View File

@ -16,8 +16,8 @@
package org.microg.gms.checkin package org.microg.gms.checkin
import android.content.Context import android.content.Context
import org.microg.gms.settings.SettingsContract import org.microg.mgms.settings.SettingsContract
import org.microg.gms.settings.SettingsContract.CheckIn import org.microg.mgms.settings.SettingsContract.CheckIn
data class LastCheckinInfo( data class LastCheckinInfo(
val lastCheckin: Long, val lastCheckin: Long,

View File

@ -9,9 +9,9 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.microg.gms.settings.SettingsContract.CheckIn import org.microg.mgms.settings.SettingsContract.CheckIn
import org.microg.gms.settings.SettingsContract.getSettings import org.microg.mgms.settings.SettingsContract.getSettings
import org.microg.gms.settings.SettingsContract.setSettings import org.microg.mgms.settings.SettingsContract.setSettings
import java.io.Serializable import java.io.Serializable
data class ServiceInfo(val configuration: ServiceConfiguration, val lastCheckin: Long, val androidId: Long) : Serializable data class ServiceInfo(val configuration: ServiceConfiguration, val lastCheckin: Long, val androidId: Long) : Serializable

View File

@ -5,9 +5,9 @@ import android.content.Intent
import android.net.* import android.net.*
import android.util.Log import android.util.Log
import org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT import org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT
import org.microg.gms.settings.SettingsContract import org.microg.mgms.settings.SettingsContract
import org.microg.gms.settings.SettingsContract.Gcm import org.microg.mgms.settings.SettingsContract.Gcm
import org.microg.gms.settings.SettingsContract.setSettings import org.microg.mgms.settings.SettingsContract.setSettings
@Suppress("Warnings") @Suppress("Warnings")
data class GcmPrefs( data class GcmPrefs(

View File

@ -1,4 +1,4 @@
package org.microg.gms.settings package org.microg.mgms.settings
import android.content.ContentValues import android.content.ContentValues
import android.content.Context import android.content.Context
@ -7,7 +7,7 @@ import android.net.Uri
import android.os.Binder import android.os.Binder
object SettingsContract { object SettingsContract {
const val AUTHORITY = "org.microg.gms.settings" const val AUTHORITY = "org.microg.mgms.settings"
val AUTHORITY_URI: Uri = Uri.parse("content://$AUTHORITY") val AUTHORITY_URI: Uri = Uri.parse("content://$AUTHORITY")
object CheckIn { object CheckIn {

View File

@ -1,4 +1,4 @@
package org.microg.gms.settings package org.microg.mgms.settings
import android.content.ContentProvider import android.content.ContentProvider
import android.content.ContentValues import android.content.ContentValues
@ -11,10 +11,10 @@ import android.net.Uri
import android.util.Log import android.util.Log
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import org.microg.gms.common.PackageUtils.warnIfNotMainProcess import org.microg.gms.common.PackageUtils.warnIfNotMainProcess
import org.microg.gms.settings.SettingsContract.AUTHORITY import org.microg.mgms.settings.SettingsContract.AUTHORITY
import org.microg.gms.settings.SettingsContract.Auth import org.microg.mgms.settings.SettingsContract.Auth
import org.microg.gms.settings.SettingsContract.CheckIn import org.microg.mgms.settings.SettingsContract.CheckIn
import org.microg.gms.settings.SettingsContract.Gcm import org.microg.mgms.settings.SettingsContract.Gcm
import java.io.File import java.io.File
/** /**