Merge branch 'merge-v0.2.16.204713' (7cfd3ca0) · Commits · e / os / GmsCore

build.gradle

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,9 +4,9 @@
		*/

		buildscript {
		ext.nlpVersion = '2.0-alpha5'
		ext.nlpVersion = '2.0-alpha6'
		ext.remoteDroidGuardVersion = '0.1.2'
		ext.safeParcelVersion = '1.6.0'
		ext.safeParcelVersion = '1.7.0'
		ext.wearableVersion = '0.1.1'

		ext.kotlinVersion = '1.4.10'
		@@ -57,7 +57,7 @@ def execResult(...args) {
		return stdout.toString().trim()
		}

		def gmsVersion = "20.42.15"
		def gmsVersion = "20.47.13"
		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
		def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)
		def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))

+2 −2

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ class FirebaseAuthService : BaseService(TAG, GmsService.FIREBASE_AUTH) {
		PackageUtils.getAndCheckCallingPackage(this, request.packageName)
		val apiKey = request.extras?.getString(Constants.EXTRA_API_KEY)
		val libraryVersion = request.extras?.getString(Constants.EXTRA_LIBRARY_VERSION)
		if (apiKey == null \|\| libraryVersion == null) {
		if (apiKey == null) {
		callback.onPostInitComplete(CommonStatusCodes.DEVELOPER_ERROR, null, null)
		} else {
		callback.onPostInitComplete(0, FirebaseAuthServiceImpl(this, lifecycle, request.packageName, libraryVersion, apiKey).asBinder(), null)
		@@ -82,7 +82,7 @@ class FirebaseAuthService : BaseService(TAG, GmsService.FIREBASE_AUTH) {
		}
		}

		class FirebaseAuthServiceImpl(private val context: Context, private val lifecycle: Lifecycle, private val packageName: String, private val libraryVersion: String, private val apiKey: String) : IFirebaseAuthService.Stub(), LifecycleOwner {
		class FirebaseAuthServiceImpl(private val context: Context, private val lifecycle: Lifecycle, private val packageName: String, private val libraryVersion: String?, private val apiKey: String) : IFirebaseAuthService.Stub(), LifecycleOwner {
		private val client = IdentityToolkitClient(context, apiKey)
		private var authorizedDomain: String? = null

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ SPDX-FileCopyrightText: 2020, microG Project Team
		~ SPDX-License-Identifier: Apache-2.0
		-->

		<resources>
		<string name="menu_advanced">Дадаткова</string>

		<string name="list_no_item_none">Пуста</string>
		<string name="list_item_see_all">Паказаць усё</string>

		<string name="open_app">адкрыць</string>
		</resources>

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ SPDX-FileCopyrightText: 2020, microG Project Team
		~ SPDX-License-Identifier: Apache-2.0
		-->

		<resources>
		<string name="menu_advanced">詳細設定</string>

		<string name="list_no_item_none">アイテムがありません</string>
		<string name="list_item_see_all">全て表示</string>

		<string name="open_app">開く</string>
		</resources>

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,4 +8,7 @@
		<string name="menu_advanced">Дополнительно</string>

		<string name="list_no_item_none">Пусто</string>
		<string name="list_item_see_all">Показать всё</string>

		<string name="open_app">открыть</string>
		</resources>