Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
GmsCore
Commits
baf890cf
Verified
Commit
baf890cf
authored
Jan 12, 2021
by
Marvin W.
🐿
Browse files
Bump version
parent
b0fae31c
Changes
13
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
baf890cf
<img src="http://i.imgur.com/hXY4lcC.png" height="42px" alt="microG" /> Services Core (GmsCore)
=======
[

](https://travis-ci.com/microg/GmsCore)
[

](https://travis-ci.com/microg/GmsCore)
microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow applications designed for Google Play Services to run on systems, where Play Services is not available.
...
...
build.gradle
View file @
baf890cf
...
...
@@ -57,7 +57,7 @@ def execResult(...args) {
return
stdout
.
toString
().
trim
()
}
def
gmsVersion
=
"20.47.1
3
"
def
gmsVersion
=
"20.47.1
4
"
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"
))
...
...
play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
View file @
baf890cf
...
...
@@ -55,7 +55,7 @@ public class GoogleApiAvailability {
/**
* Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode).
*/
public
static
final
int
GOOGLE_PLAY_SERVICES_VERSION_CODE
=
Constants
.
MAX_REFERENCE
_VERSION
;
public
static
final
int
GOOGLE_PLAY_SERVICES_VERSION_CODE
=
Constants
.
GMS
_VERSION
_CODE
;
private
static
GoogleApiAvailability
instance
;
...
...
play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java
View file @
baf890cf
...
...
@@ -52,7 +52,7 @@ public class GooglePlayServicesUtil {
* Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode).
*/
@Deprecated
public
static
final
int
GOOGLE_PLAY_SERVICES_VERSION_CODE
=
Constants
.
MAX_REFERENCE
_VERSION
;
public
static
final
int
GOOGLE_PLAY_SERVICES_VERSION_CODE
=
Constants
.
GMS
_VERSION
_CODE
;
/**
* Package name for Google Play Store.
...
...
play-services-basement/build.gradle
View file @
baf890cf
...
...
@@ -40,6 +40,7 @@ android {
versionName
version
minSdkVersion
androidMinSdk
targetSdkVersion
androidTargetSdk
buildConfigField
"int"
,
"VERSION_CODE"
,
"$appVersionCode"
}
sourceSets
{
...
...
play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
View file @
baf890cf
...
...
@@ -60,12 +60,12 @@ public class GetServiceRequest extends AutoSafeParcelable {
private
GetServiceRequest
()
{
serviceId
=
-
1
;
gmsVersion
=
Constants
.
MAX_REFERENCE
_VERSION
;
gmsVersion
=
Constants
.
GMS
_VERSION
_CODE
;
}
public
GetServiceRequest
(
int
serviceId
)
{
this
.
serviceId
=
serviceId
;
this
.
gmsVersion
=
Constants
.
MAX_REFERENCE
_VERSION
;
this
.
gmsVersion
=
Constants
.
GMS
_VERSION
_CODE
;
this
.
field12
=
true
;
}
...
...
play-services-basement/src/main/java/org/microg/gms/common/Constants.java
View file @
baf890cf
...
...
@@ -16,9 +16,13 @@
package
org.microg.gms.common
;
import
org.microg.gms.basement.BuildConfig
;
public
class
Constants
{
public
static
final
int
MAX_REFERENCE_VERSION
=
204713
*
1000
;
public
static
final
int
GMS_VERSION_CODE
=
(
BuildConfig
.
VERSION_CODE
/
1000
)
*
1000
;
public
static
final
String
GMS_PACKAGE_NAME
=
"com.google.android.gms"
;
public
static
final
String
GSF_PACKAGE_NAME
=
"com.google.android.gsf"
;
public
static
final
String
GMS_PACKAGE_SIGNATURE_SHA1
=
"38918a453d07199354f8b19af05ec6562ced5788"
;
@Deprecated
public
static
final
int
MAX_REFERENCE_VERSION
=
GMS_VERSION_CODE
;
}
play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java
View file @
baf890cf
...
...
@@ -58,7 +58,7 @@ public class AuthRequest extends HttpFormClient.Request {
@RequestContent
(
"lang"
)
public
String
locale
;
@RequestContent
(
"google_play_services_version"
)
public
int
gmsVersion
=
Constants
.
MAX_REFERENCE
_VERSION
;
public
int
gmsVersion
=
Constants
.
GMS
_VERSION
_CODE
;
@RequestContent
(
"accountType"
)
public
String
accountType
;
@RequestContent
(
"Email"
)
...
...
play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
View file @
baf890cf
...
...
@@ -73,7 +73,7 @@ import static android.view.View.INVISIBLE;
import
static
android
.
view
.
View
.
VISIBLE
;
import
static
android
.
view
.
inputmethod
.
InputMethodManager
.
SHOW_IMPLICIT
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
GMS_PACKAGE_NAME
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
MAX_REFERENCE
_VERSION
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
GMS
_VERSION
_CODE
;
public
class
LoginActivity
extends
AssistantActivity
{
public
static
final
String
TMPL_NEW_ACCOUNT
=
"new_account"
;
...
...
@@ -463,7 +463,7 @@ public class LoginActivity extends AssistantActivity {
@JavascriptInterface
public
final
int
getPlayServicesVersionCode
()
{
return
MAX_REFERENCE
_VERSION
;
return
GMS
_VERSION
_CODE
;
}
@JavascriptInterface
...
...
play-services-core/src/main/java/org/microg/gms/snet/Attestation.java
View file @
baf890cf
...
...
@@ -76,7 +76,7 @@ public class Attestation {
.
packageName
(
packageName
)
.
fileDigest
(
getPackageFileDigest
())
.
signatureDigest
(
getPackageSignatures
())
.
gmsVersionCode
(
Constants
.
MAX_REFERENCE
_VERSION
)
.
gmsVersionCode
(
Constants
.
GMS
_VERSION
_CODE
)
//.googleCn(false)
.
seLinuxState
(
new
SELinuxState
.
Builder
().
enabled
(
true
).
supported
(
true
).
build
())
.
suCandidates
(
Collections
.<
FileState
>
emptyList
())
...
...
@@ -155,7 +155,7 @@ public class Attestation {
connection
.
setRequestProperty
(
"content-type"
,
"application/x-protobuf"
);
connection
.
setRequestProperty
(
"Accept-Encoding"
,
"gzip"
);
Build
build
=
Utils
.
getBuild
(
context
);
connection
.
setRequestProperty
(
"User-Agent"
,
"SafetyNet/"
+
Constants
.
MAX_REFERENCE
_VERSION
+
" ("
+
build
.
device
+
" "
+
build
.
id
+
"); gzip"
);
connection
.
setRequestProperty
(
"User-Agent"
,
"SafetyNet/"
+
Constants
.
GMS
_VERSION
_CODE
+
" ("
+
build
.
device
+
" "
+
build
.
id
+
"); gzip"
);
OutputStream
os
=
connection
.
getOutputStream
();
os
.
write
(
request
.
encode
());
...
...
play-services-iid/src/main/java/org/microg/gms/iid/InstanceIdRpc.java
View file @
baf890cf
...
...
@@ -57,7 +57,7 @@ import static com.google.android.gms.iid.InstanceID.ERROR_SERVICE_NOT_AVAILABLE;
import
static
com
.
google
.
android
.
gms
.
iid
.
InstanceID
.
ERROR_TIMEOUT
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
GMS_PACKAGE_NAME
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
GSF_PACKAGE_NAME
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
MAX_REFERENCE
_VERSION
;
import
static
org
.
microg
.
gms
.
common
.
Constants
.
GMS
_VERSION
_CODE
;
import
static
org
.
microg
.
gms
.
gcm
.
GcmConstants
.
ACTION_C2DM_REGISTER
;
import
static
org
.
microg
.
gms
.
gcm
.
GcmConstants
.
ACTION_C2DM_REGISTRATION
;
import
static
org
.
microg
.
gms
.
gcm
.
GcmConstants
.
ACTION_INSTANCE_ID
;
...
...
@@ -284,7 +284,7 @@ public class InstanceIdRpc {
data
.
putString
(
EXTRA_OS_VERSION
,
Integer
.
toString
(
Build
.
VERSION
.
SDK_INT
));
data
.
putString
(
EXTRA_APP_VERSION_CODE
,
Integer
.
toString
(
getSelfVersionCode
(
context
)));
data
.
putString
(
EXTRA_APP_VERSION_NAME
,
getSelfVersionName
(
context
));
data
.
putString
(
EXTRA_CLIENT_VERSION
,
"iid-"
+
MAX_REFERENCE
_VERSION
);
data
.
putString
(
EXTRA_CLIENT_VERSION
,
"iid-"
+
GMS
_VERSION
_CODE
);
data
.
putString
(
EXTRA_APP_ID
,
InstanceID
.
sha1KeyPair
(
keyPair
));
String
pub
=
base64encode
(
keyPair
.
getPublic
().
getEncoded
());
data
.
putString
(
EXTRA_PUBLIC_KEY
,
pub
);
...
...
play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java
View file @
baf890cf
...
...
@@ -46,7 +46,7 @@ public abstract class GoogleLocationManagerClient extends GmsClient<IGoogleLocat
throws
RemoteException
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
"client_name"
,
"locationServices"
);
broker
.
getGoogleLocationManagerService
(
callbacks
,
Constants
.
MAX_REFERENCE
_VERSION
,
broker
.
getGoogleLocationManagerService
(
callbacks
,
Constants
.
GMS
_VERSION
_CODE
,
getContext
().
getPackageName
(),
bundle
);
}
}
play-services-nearby-core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureNotificationServiceImpl.kt
View file @
baf890cf
...
...
@@ -96,7 +96,7 @@ class ExposureNotificationServiceImpl(private val context: Context, private val
}
override
fun
getVersion
(
params
:
GetVersionParams
)
{
params
.
callback
.
onResult
(
Status
.
SUCCESS
,
Constants
.
MAX_REFERENCE
_VERSION
.
toLong
())
params
.
callback
.
onResult
(
Status
.
SUCCESS
,
Constants
.
GMS
_VERSION
_CODE
.
toLong
())
}
override
fun
getCalibrationConfidence
(
params
:
GetCalibrationConfidenceParams
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment