From 2bc1850b4e6ec36a77a4734942add0dcd3d13c4d Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 19 Jul 2018 11:20:40 +0200 Subject: [PATCH 01/46] Setup CI --- .gitlab-ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..8b3637fc76 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,24 @@ +image: "registry.gitlab.eelo.io:5000/eelo/docker-android-apps-cicd:latest" + +stages: +- build + +before_script: +- export GRADLE_USER_HOME=$(pwd)/.gradle +- chmod +x ./gradlew + +cache: + key: ${CI_PROJECT_ID} + paths: + - .gradle/ + +build: + stage: build + script: + - echo $ANDROID_SDK_HOME + - echo $JAVA_HOME + - git submodule update --recursive --init + - ./gradlew build + artifacts: + paths: + - play-services-core/build/outputs/apk/ From 824ad17b969591bf8817c2f9fc224b070f92b6d9 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 23 Jul 2018 11:59:32 +0200 Subject: [PATCH 02/46] Update Google Play Services version --- play-services-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index b43dfe90fd..319fa7377b 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -65,7 +65,7 @@ android { versionName getMyVersionName() def x = getMyVersionCode() - 367 // We are not allowed to freely choose the hundreds column as it defines the device type - versionCode(12221400 + x % 100 + ((int) (x / 100)) * 1000) + versionCode(12451000 + x % 100 + ((int) (x / 100)) * 1000) minSdkVersion androidMinSdk() targetSdkVersion androidTargetSdk() From f8dd0a95eb045785a78c6b0164417937cbdbf5ce Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 23 Jul 2018 12:11:47 +0200 Subject: [PATCH 03/46] Update extern/UnifiedNlp to latest --- extern/UnifiedNlp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp index b331309c66..82479b79c7 160000 --- a/extern/UnifiedNlp +++ b/extern/UnifiedNlp @@ -1 +1 @@ -Subproject commit b331309c66d399918f7b293ceb6c3533ad24af88 +Subproject commit 82479b79c76353f532e0c6edd0d1dee8d49c48f4 From 875d9e28decd4da4841bc9db27cfe908701a6e54 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 20 Aug 2018 12:52:40 +0200 Subject: [PATCH 04/46] Default settings for Safety Net --- .../src/main/java/org/microg/gms/snet/SafetyNetPrefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java index b1f532102c..1f3abb84bb 100644 --- a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java @@ -56,7 +56,7 @@ private SafetyNetPrefs(Context context) { } public void update() { - disabled = defaultPreferences.getBoolean(PREF_SNET_DISABLED, true); + disabled = defaultPreferences.getBoolean(PREF_SNET_DISABLED, false); official = defaultPreferences.getBoolean(PREF_SNET_OFFICIAL, true); selfSigned = defaultPreferences.getBoolean(PREF_SNET_SELF_SIGNED, false); thirdParty = defaultPreferences.getBoolean(PREF_SNET_THIRD_PARTY, false); From 89768b7f9473616cf2ea74a7fc78852e1c12cee5 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 20 Aug 2018 12:53:34 +0200 Subject: [PATCH 05/46] Default settings for Google Registration --- .../src/main/java/org/microg/gms/checkin/CheckinManager.java | 2 +- .../src/main/java/org/microg/gms/checkin/CheckinService.java | 2 +- .../src/main/java/org/microg/gms/checkin/TriggerReceiver.java | 2 +- .../src/main/java/org/microg/gms/ui/CheckinFragment.java | 2 +- .../src/main/java/org/microg/gms/ui/SettingsActivity.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java index 4b67bdd564..b8cfc399cc 100644 --- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java @@ -43,7 +43,7 @@ public static synchronized LastCheckinInfo checkin(Context context, boolean forc LastCheckinInfo info = LastCheckinInfo.read(context); if (!force && info.lastCheckin > System.currentTimeMillis() - MIN_CHECKIN_INTERVAL) return null; - if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, false)) + if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, true)) return null; List accounts = new ArrayList(); AccountManager accountManager = AccountManager.get(context); diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java index 9fc69307da..a7f3371537 100644 --- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java @@ -55,7 +55,7 @@ public CheckinService() { @Override protected void onHandleIntent(Intent intent) { try { - if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PREF_ENABLE_CHECKIN, false)) { + if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PREF_ENABLE_CHECKIN, true)) { LastCheckinInfo info = CheckinManager.checkin(this, intent.getBooleanExtra(EXTRA_FORCE_CHECKIN, false)); if (info != null) { Log.d(TAG, "Checked in as " + Long.toHexString(info.androidId)); diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java index fbb8aaca37..847d229952 100644 --- a/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java @@ -34,7 +34,7 @@ public void onReceive(Context context, Intent intent) { boolean force = "android.provider.Telephony.SECRET_CODE".equals(intent.getAction()); ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, false) || force) { + if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, true) || force) { if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction()) && LastCheckinInfo.read(context).lastCheckin > System.currentTimeMillis() - REGULAR_CHECKIN_INTERVAL) { return; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java index 24b662e7be..0cb277c540 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java @@ -37,7 +37,7 @@ public CheckinFragment() { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - switchBar.setChecked(PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, false)); + switchBar.setChecked(PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, true)); } @Override diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java index 5de7fffea3..f75bc33e86 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java @@ -89,7 +89,7 @@ private void updateDetails() { Preferences.splitBackendString(unifiedNlPrefs.getGeocoderBackends()).length; findPreference(PREF_UNIFIEDNLP).setSummary(getResources().getQuantityString(R.plurals.pref_unifiednlp_summary, backendCount, backendCount)); - boolean checkinEnabled = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, false); + boolean checkinEnabled = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, true); findPreference(PREF_CHECKIN).setSummary(checkinEnabled ? R.string.service_status_enabled : R.string.service_status_disabled); } } From b4eaae3e2cabb0ecc50d9cb83b807b86577e32bb Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 20 Aug 2018 12:53:49 +0200 Subject: [PATCH 06/46] Default settings for Google Cloud Messaging --- .../src/main/java/org/microg/gms/gcm/GcmPrefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java index 5a3084f02b..983b131bfa 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java @@ -83,7 +83,7 @@ public void update() { gcmLogEnabled = defaultPreferences.getBoolean(PREF_FULL_LOG, true); lastPersistedId = defaultPreferences.getString(PREF_LAST_PERSISTENT_ID, ""); confirmNewApps = defaultPreferences.getBoolean(PREF_CONFIRM_NEW_APPS, false); - gcmEnabled = defaultPreferences.getBoolean(PREF_ENABLE_GCM, false); + gcmEnabled = defaultPreferences.getBoolean(PREF_ENABLE_GCM, true); networkMobile = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_MOBILE, "0")); networkWifi = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_WIFI, "0")); From e9957f79886d046b97e954337a15faa7e91a2b28 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 20 Aug 2018 12:55:57 +0200 Subject: [PATCH 07/46] Git change UnifiedNlp remote repository --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bf2f01906a..0ac54ef70c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "extern/UnifiedNlp"] path = extern/UnifiedNlp - url = https://github.com/microg/android_packages_apps_UnifiedNlp.git + url = ssh://git@gitlab.eelo.io:2222/eelo/android_packages_apps_UnifiedNlp.git [submodule "extern/GmsApi"] path = extern/GmsApi url = https://github.com/microg/android_external_GmsApi.git From e82ab7d97ddfcd9e2e97c8d7998891c4cc571bae Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 20 Aug 2018 12:57:28 +0200 Subject: [PATCH 08/46] Use default settings for UnifiedNlp --- extern/UnifiedNlp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp index 82479b79c7..2c56cdcb7e 160000 --- a/extern/UnifiedNlp +++ b/extern/UnifiedNlp @@ -1 +1 @@ -Subproject commit 82479b79c76353f532e0c6edd0d1dee8d49c48f4 +Subproject commit 2c56cdcb7e0de2c88d0acb80727534b73dccf9e2 From 35a379eff00db2027d0f4af2bc5fdadb6d31f8a7 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 20 Aug 2018 13:01:23 +0200 Subject: [PATCH 09/46] Ability to load private projects --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b3637fc76..582181d85f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,14 @@ stages: - build before_script: +- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi +- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' +- eval $(ssh-agent -s) +- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null +- mkdir -p ~/.ssh +- chmod 700 ~/.ssh +- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts +- chmod 644 ~/.ssh/known_hosts - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew From c2cc5308008cd3932bcbc869b684bf65a505a61b Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Tue, 21 Aug 2018 11:05:35 +0200 Subject: [PATCH 10/46] Shared UserId --- play-services-core/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 2a8b7dd6f4..c880fe5214 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -16,7 +16,8 @@ --> + xmlns:tools="http://schemas.android.com/tools" + android:sharedUserId="android.uid.system"> Date: Thu, 23 Aug 2018 15:44:10 +0200 Subject: [PATCH 11/46] Revert Shared UserId This reverts commit c2cc5308008cd3932bcbc869b684bf65a505a61b. --- play-services-core/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index c880fe5214..2a8b7dd6f4 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -16,8 +16,7 @@ --> + xmlns:tools="http://schemas.android.com/tools"> Date: Wed, 29 Aug 2018 11:44:00 +0200 Subject: [PATCH 12/46] Update CI process --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 582181d85f..41362f107b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,10 +23,11 @@ cache: build: stage: build script: - - echo $ANDROID_SDK_HOME - - echo $JAVA_HOME - git submodule update --recursive --init - - ./gradlew build + - echo sdk.dir $ANDROID_HOME > local.properties + - export TERM=dumb + - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" + - ./gradlew assemble artifacts: paths: - play-services-core/build/outputs/apk/ From 60c0b7f30d9ee4f061614bfefbc1183feed16744 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Wed, 29 Aug 2018 11:55:55 +0200 Subject: [PATCH 13/46] Test --- play-services-core/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 746ea19b79..79d8444d2b 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -82,6 +82,10 @@ android { } } + lintOptions { + abortOnError false + } + lintOptions { disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity' } From a4c0b8df86aac43fc67c8047e8a076fc2cec68a3 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 30 Aug 2018 11:54:36 +0200 Subject: [PATCH 14/46] android_packages_apps_UnifiedNlp --- .gitlab-ci.yml | 2 +- .gitmodules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41362f107b..83d05c00d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "registry.gitlab.eelo.io:5000/eelo/docker-android-apps-cicd:latest" +image: "registry.gitlab.eelo.io:5000/e/apps/docker-android-apps-cicd:latest" stages: - build diff --git a/.gitmodules b/.gitmodules index 0ac54ef70c..c19fedc21e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "extern/UnifiedNlp"] path = extern/UnifiedNlp - url = ssh://git@gitlab.eelo.io:2222/eelo/android_packages_apps_UnifiedNlp.git + url = ../android_packages_apps_UnifiedNlp.git [submodule "extern/GmsApi"] path = extern/GmsApi url = https://github.com/microg/android_external_GmsApi.git From e4974d0350c15ffd4942956a88f5828d4e8e114e Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 31 Aug 2018 17:08:43 +0200 Subject: [PATCH 15/46] Only build with tags --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83d05c00d6..ae32a9591f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,8 @@ build: - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - ./gradlew assemble + only: + - tags artifacts: paths: - play-services-core/build/outputs/apk/ From 233efffbb50f540aa2f9b0d1d390ab8801c264b4 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 31 Aug 2018 19:40:11 +0200 Subject: [PATCH 16/46] Fix submodules issues --- extern/GmsApi | 2 +- extern/GmsLib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extern/GmsApi b/extern/GmsApi index db0be6ba01..a57ac35b5d 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit db0be6ba010f52b4d12e69aed2482c38a3c2406c +Subproject commit a57ac35b5da42e8b7f78cb1cd002daae404420fb diff --git a/extern/GmsLib b/extern/GmsLib index 90e9b7b79d..d3a6dfcb05 160000 --- a/extern/GmsLib +++ b/extern/GmsLib @@ -1 +1 @@ -Subproject commit 90e9b7b79dcaddfce887f87b94f80adeed8791e6 +Subproject commit d3a6dfcb054dd3464b1663057af8be13167a9241 From 004cb64747d841fd23a8dbc6e9329d0594cbcf5a Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 31 Aug 2018 19:43:53 +0200 Subject: [PATCH 17/46] Update CI --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae32a9591f..bfffccb27a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,10 +24,7 @@ build: stage: build script: - git submodule update --recursive --init - - echo sdk.dir $ANDROID_HOME > local.properties - - export TERM=dumb - - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - - ./gradlew assemble + - ./gradlew build only: - tags artifacts: From 60b4f4ed2016728911d1553ee7994779feda094b Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 30 Aug 2018 11:55:10 +0200 Subject: [PATCH 18/46] Change GitLab registry url --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfffccb27a..9e539c68e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "registry.gitlab.eelo.io:5000/e/apps/docker-android-apps-cicd:latest" +image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest" stages: - build From f415dd2e16f5e8cb4589dbc04086c5a32116b791 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 3 Jun 2019 10:57:40 +0200 Subject: [PATCH 19/46] Create local.properties during build --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e539c68e5..2347fd2644 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ build: stage: build script: - git submodule update --recursive --init + - echo sdk.dir $ANDROID_HOME > local.properties - ./gradlew build only: - tags From d6041f5a0f3c6b4d7575f8944452cbc0e0629366 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 3 Jun 2019 11:20:20 +0200 Subject: [PATCH 20/46] Build mapbox --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2347fd2644..9958c9ed04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ build: script: - git submodule update --recursive --init - echo sdk.dir $ANDROID_HOME > local.properties + - echo mapbox.enabled true >> local.properties - ./gradlew build only: - tags From 2609850b43127cfa7a4a8f57125c45e89ea19eed Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Wed, 5 Jun 2019 15:13:50 +0200 Subject: [PATCH 21/46] Revert "Build mapbox" This reverts commit d6041f5a0f3c6b4d7575f8944452cbc0e0629366. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9958c9ed04..2347fd2644 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,6 @@ build: script: - git submodule update --recursive --init - echo sdk.dir $ANDROID_HOME > local.properties - - echo mapbox.enabled true >> local.properties - ./gradlew build only: - tags From 18c6bb50919eb8917083fc676d0c54a0aa1ef6c0 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 6 Jun 2019 14:42:37 +0200 Subject: [PATCH 22/46] Fix SafetyNet --- .../src/main/java/org/microg/gms/snet/SafetyNetPrefs.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java index d5849fe847..850708ec41 100644 --- a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java @@ -56,8 +56,8 @@ private SafetyNetPrefs(Context context) { } public void update() { - disabled = defaultPreferences.getBoolean(PREF_SNET_DISABLED, true); - official = defaultPreferences.getBoolean(PREF_SNET_OFFICIAL, true); + disabled = defaultPreferences.getBoolean(PREF_SNET_DISABLED, false); + official = defaultPreferences.getBoolean(PREF_SNET_OFFICIAL, false); selfSigned = defaultPreferences.getBoolean(PREF_SNET_SELF_SIGNED, false); thirdParty = defaultPreferences.getBoolean(PREF_SNET_THIRD_PARTY, false); customUrl = defaultPreferences.getString(PREF_SNET_CUSTOM_URL, null); From 686ff93806bda0a04ae952d993455b2a5ec70ee7 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 14 Jun 2019 11:36:43 +0200 Subject: [PATCH 23/46] Update CI conf --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2347fd2644..3e12b08d23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,8 @@ build: script: - git submodule update --recursive --init - echo sdk.dir $ANDROID_HOME > local.properties + - export TERM=dumb + - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - ./gradlew build only: - tags From 2de26e199709f782aede93c77a01fc4e34d5340a Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 3 Jun 2019 11:20:20 +0200 Subject: [PATCH 24/46] Build mapbox --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e12b08d23..5fc65bcb33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ build: - echo sdk.dir $ANDROID_HOME > local.properties - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" + - echo mapbox.enabled true >> local.properties - ./gradlew build only: - tags From 5138dac771cd29b5e06d9a4d75a3d0b5ee07b245 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 1 Jul 2019 11:09:56 +0200 Subject: [PATCH 25/46] Revert "Build mapbox" This reverts commit 2de26e199709f782aede93c77a01fc4e34d5340a. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fc65bcb33..3e12b08d23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,6 @@ build: - echo sdk.dir $ANDROID_HOME > local.properties - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - - echo mapbox.enabled true >> local.properties - ./gradlew build only: - tags From 1c80f6f2c460f06b07f73aa75f286421adb05584 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 1 Jul 2019 10:05:52 +0000 Subject: [PATCH 26/46] Fix SafetyNet default prefs --- .../src/main/java/org/microg/gms/snet/SafetyNetPrefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java index 850708ec41..e717e1dc9c 100644 --- a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetPrefs.java @@ -57,7 +57,7 @@ private SafetyNetPrefs(Context context) { public void update() { disabled = defaultPreferences.getBoolean(PREF_SNET_DISABLED, false); - official = defaultPreferences.getBoolean(PREF_SNET_OFFICIAL, false); + official = defaultPreferences.getBoolean(PREF_SNET_OFFICIAL, true); selfSigned = defaultPreferences.getBoolean(PREF_SNET_SELF_SIGNED, false); thirdParty = defaultPreferences.getBoolean(PREF_SNET_THIRD_PARTY, false); customUrl = defaultPreferences.getString(PREF_SNET_CUSTOM_URL, null); From 0b5525007f9b1eac10811e5eee2a260790681fc2 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 3 Jun 2019 11:20:20 +0200 Subject: [PATCH 27/46] Build mapbox --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e12b08d23..5fc65bcb33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ build: - echo sdk.dir $ANDROID_HOME > local.properties - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" + - echo mapbox.enabled true >> local.properties - ./gradlew build only: - tags From 3cae1179d07e4ffa7aa6967016ed348ce61c3598 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 28 Oct 2019 12:03:01 +0100 Subject: [PATCH 28/46] Fix build process --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fc65bcb33..fa3e0835f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ build: - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - echo mapbox.enabled true >> local.properties - - ./gradlew build + - ./gradlew assemble only: - tags artifacts: From 93e070b7f9e6d36eaacb0bce87ae0ca8cb8a875a Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Wed, 30 Oct 2019 10:16:10 +0100 Subject: [PATCH 29/46] Revert "Build mapbox" This reverts commit 0b5525007f9b1eac10811e5eee2a260790681fc2. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa3e0835f8..edfb9a3007 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,6 @@ build: - echo sdk.dir $ANDROID_HOME > local.properties - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - - echo mapbox.enabled true >> local.properties - ./gradlew assemble only: - tags From 74049927a92706d323b8aedebafde9227e4ff70f Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 4 Nov 2019 17:09:01 +0000 Subject: [PATCH 30/46] Always build --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edfb9a3007..ea086073ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,8 +28,6 @@ build: - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - ./gradlew assemble - only: - - tags artifacts: paths: - play-services-core/build/outputs/apk/ From d89632ca8eecdb68cd5a5fda2f162a48bcae9a5b Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 25 Nov 2019 17:02:15 +0000 Subject: [PATCH 31/46] Enable mapbox --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea086073ac..3ea467079a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,8 @@ build: script: - git submodule update --recursive --init - echo sdk.dir $ANDROID_HOME > local.properties + - echo mapbox.key $MAPBOX_KEY >> local.properties + - echo mapbox.enabled true >> local.properties - export TERM=dumb - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - ./gradlew assemble From cdbe42fd5b4485448c58c14b603266692639f2cd Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Fri, 29 Nov 2019 16:03:57 +0000 Subject: [PATCH 32/46] Resolve "Push Notifications don't work" --- .../src/main/java/org/microg/gms/auth/login/LoginActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java index 7a7bfacf5c..a538c55ffa 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java @@ -55,6 +55,7 @@ import org.microg.gms.checkin.LastCheckinInfo; import org.microg.gms.common.HttpFormClient; import org.microg.gms.common.Utils; +import org.microg.gms.gcm.McsService; import org.microg.gms.people.PeopleManager; import java.io.IOException; @@ -357,6 +358,7 @@ public void onException(Exception exception) { private boolean checkin(boolean force) { try { CheckinManager.checkin(LoginActivity.this, force); + McsService.scheduleReconnect(this); return true; } catch (IOException e) { Log.w(TAG, "Checkin failed", e); From 0069eecff0e2aff598a58617435639295ad52a1b Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Fri, 29 Nov 2019 16:04:10 +0000 Subject: [PATCH 33/46] Return v1 for maps module --- .../android/gms/chimera/container/DynamiteLoaderImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java index 43bd5cafed..a841984c76 100644 --- a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java @@ -66,6 +66,10 @@ public int getModuleVersion2(IObjectWrapper context, String moduleId, boolean up Log.d(TAG, "returning temp fix module version for " + moduleId + ". Cast API wil not be functional!"); return 1; } + if (moduleId.equals("com.google.android.gms.maps_dynamite")) { + Log.d(TAG, "returning v1 for maps"); + return 1; + } Log.d(TAG, "unimplemented Method: getModuleVersion for " + moduleId); return 0; } From d9f37c03408ec8334705055e0fbf601e69ebd18b Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Mon, 16 Dec 2019 14:00:40 +0000 Subject: [PATCH 34/46] Fix copy/pasted from https://github.com/microg/android_packages_apps_GmsCore/pull/931/files --- .../android/gms/common/security/ProviderInstallerImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java index 6d702279f1..cb8d856029 100644 --- a/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java @@ -46,6 +46,8 @@ public class ProviderInstallerImpl { private static final String TAG = "GmsProviderInstaller"; + + //private static final List DISABLED = Collections.singletonList("com.discord"); private static final List DISABLED = Collections.unmodifiableList(Arrays.asList("com.discord", "com.bankid.bus")); public static void insertProvider(Context context) { From 2447a9a683471b247366dd5a4b99399df7696192 Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Mon, 16 Dec 2019 14:01:59 +0000 Subject: [PATCH 35/46] #21 fix: don't show 2 links to microG in Settings --- play-services-core/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 823085688d..cdb10b4aec 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -441,7 +441,7 @@ - Date: Tue, 17 Dec 2019 14:52:29 +0000 Subject: [PATCH 36/46] Revert "Merge branch '21-Two_microG_links_in_settings' into 'dev'" This reverts merge request !4 --- play-services-core/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index cdb10b4aec..823085688d 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -441,7 +441,7 @@ - - - + --> Date: Fri, 20 Dec 2019 13:22:53 +0000 Subject: [PATCH 38/46] Use /e/apps/ repos as submodules --- .gitmodules | 15 ++++++++++----- extern/GmsLib | 2 +- extern/RemoteDroidGuard | 2 +- extern/UnifiedNlp | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index c316cd6076..06b057a0f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,20 @@ [submodule "extern/UnifiedNlp"] path = extern/UnifiedNlp - url = ../android_packages_apps_UnifiedNlp.git + url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp + branch = master [submodule "extern/GmsApi"] path = extern/GmsApi - url = https://github.com/microg/android_external_GmsApi.git + url = https://gitlab.e.foundation/e/apps/GmsApi + branch = master [submodule "extern/Wearable"] path = extern/Wearable - url = https://github.com/microg/android_external_Wearable.git + url = https://gitlab.e.foundation/e/apps/Wearable + branch = master [submodule "extern/GmsLib"] path = extern/GmsLib - url = https://github.com/microg/android_external_GmsLib.git + url = https://gitlab.e.foundation/e/apps/GmsLib + bramch = master [submodule "extern/RemoteDroidGuard"] path = extern/RemoteDroidGuard - url = https://github.com/microg/android_packages_apps_RemoteDroidGuard.git + url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard + branch = master diff --git a/extern/GmsLib b/extern/GmsLib index 15cd4491bc..9326461e73 160000 --- a/extern/GmsLib +++ b/extern/GmsLib @@ -1 +1 @@ -Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792 +Subproject commit 9326461e73017ae1ecf9b413d35e007929c292eb diff --git a/extern/RemoteDroidGuard b/extern/RemoteDroidGuard index 47073dd7a2..821d63193a 160000 --- a/extern/RemoteDroidGuard +++ b/extern/RemoteDroidGuard @@ -1 +1 @@ -Subproject commit 47073dd7a2a039593fe556af8f9f33e325febfa7 +Subproject commit 821d63193a57a9d60892712a29c5e39211bb60a3 diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp index 2c56cdcb7e..5516c49cb4 160000 --- a/extern/UnifiedNlp +++ b/extern/UnifiedNlp @@ -1 +1 @@ -Subproject commit 2c56cdcb7e0de2c88d0acb80727534b73dccf9e2 +Subproject commit 5516c49cb40d5008bd76a0818bb856da1b134f05 From 89dbb73adb43f0836d836d5d5bcbd6faa9318584 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 20 Dec 2019 15:45:05 +0100 Subject: [PATCH 39/46] Setup submodule sync --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ea467079a..a8189f7d11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,9 @@ image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest stages: - build +variables: + GIT_SUBMODULE_STRATEGY: normal + before_script: - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' @@ -23,7 +26,6 @@ cache: build: stage: build script: - - git submodule update --recursive --init - echo sdk.dir $ANDROID_HOME > local.properties - echo mapbox.key $MAPBOX_KEY >> local.properties - echo mapbox.enabled true >> local.properties From 01447e022e0e5d3fca907dec1832dd2824007f0c Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Thu, 2 Jan 2020 15:10:39 +0000 Subject: [PATCH 40/46] Pointing RemoteDroidGuard submodule to fix, and updating all submodules to use dev branch --- .gitlab-ci.yml | 2 +- .gitmodules | 10 +++++----- extern/RemoteDroidGuard | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8189f7d11..b7093f7042 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - build variables: - GIT_SUBMODULE_STRATEGY: normal + GIT_SUBMODULE_STRATEGY: recursive before_script: - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi diff --git a/.gitmodules b/.gitmodules index 06b057a0f1..7baca207ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,20 @@ [submodule "extern/UnifiedNlp"] path = extern/UnifiedNlp url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp - branch = master + branch = dev [submodule "extern/GmsApi"] path = extern/GmsApi url = https://gitlab.e.foundation/e/apps/GmsApi - branch = master + branch = dev [submodule "extern/Wearable"] path = extern/Wearable url = https://gitlab.e.foundation/e/apps/Wearable - branch = master + branch = dev [submodule "extern/GmsLib"] path = extern/GmsLib url = https://gitlab.e.foundation/e/apps/GmsLib - bramch = master + branch = dev [submodule "extern/RemoteDroidGuard"] path = extern/RemoteDroidGuard url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard - branch = master + branch = dev diff --git a/extern/RemoteDroidGuard b/extern/RemoteDroidGuard index 821d63193a..0c5c944a54 160000 --- a/extern/RemoteDroidGuard +++ b/extern/RemoteDroidGuard @@ -1 +1 @@ -Subproject commit 821d63193a57a9d60892712a29c5e39211bb60a3 +Subproject commit 0c5c944a54962a4c60cffa44785a36d7251df635 From 3b8aff2eca16f99a63494f1d36d4cc4b41216933 Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Fri, 3 Jan 2020 17:25:08 +0000 Subject: [PATCH 41/46] Resolve "Implement Firebase DynamicLinks" --- .gitlab-ci.yml | 2 +- extern/GmsApi | 2 +- extern/GmsLib | 2 +- firebase-dynamic-links | 1 + firebase-dynamic-links-api | 1 + gradle.properties | 1 + play-services-appinvite | 1 + play-services-appinvite-api | 1 + play-services-core/build.gradle | 2 + .../src/main/AndroidManifest.xml | 14 ++++ .../gms/appinvite/AppInviteService.java | 49 +++++++++++++ .../gms/appinvite/AppInviteServiceImpl.java | 68 +++++++++++++++++++ .../dynamiclinks/DynamicLinksService.java | 49 +++++++++++++ .../dynamiclinks/DynamicLinksServiceImpl.java | 64 +++++++++++++++++ settings.gradle | 4 ++ 15 files changed, 258 insertions(+), 3 deletions(-) create mode 120000 firebase-dynamic-links create mode 120000 firebase-dynamic-links-api create mode 100644 gradle.properties create mode 120000 play-services-appinvite create mode 120000 play-services-appinvite-api create mode 100644 play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteService.java create mode 100644 play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteServiceImpl.java create mode 100644 play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksService.java create mode 100644 play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksServiceImpl.java diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7093f7042..fff35a132d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ build: - echo mapbox.key $MAPBOX_KEY >> local.properties - echo mapbox.enabled true >> local.properties - export TERM=dumb - - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" + - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" - ./gradlew assemble artifacts: paths: diff --git a/extern/GmsApi b/extern/GmsApi index 2a43448e49..09bf949403 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6 +Subproject commit 09bf9494038ab53e0b86d8699db409b955fe3c0c diff --git a/extern/GmsLib b/extern/GmsLib index 9326461e73..614e111fa0 160000 --- a/extern/GmsLib +++ b/extern/GmsLib @@ -1 +1 @@ -Subproject commit 9326461e73017ae1ecf9b413d35e007929c292eb +Subproject commit 614e111fa02b9aeb195879735ababe869074617c diff --git a/firebase-dynamic-links b/firebase-dynamic-links new file mode 120000 index 0000000000..2b9de59721 --- /dev/null +++ b/firebase-dynamic-links @@ -0,0 +1 @@ +extern/GmsLib/firebase-dynamic-links \ No newline at end of file diff --git a/firebase-dynamic-links-api b/firebase-dynamic-links-api new file mode 120000 index 0000000000..30d4bb017b --- /dev/null +++ b/firebase-dynamic-links-api @@ -0,0 +1 @@ +extern/GmsApi/firebase-dynamic-links-api \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..e08c81d314 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xms512m -Xmx4096m diff --git a/play-services-appinvite b/play-services-appinvite new file mode 120000 index 0000000000..3147eb928f --- /dev/null +++ b/play-services-appinvite @@ -0,0 +1 @@ +extern/GmsLib/play-services-appinvite \ No newline at end of file diff --git a/play-services-appinvite-api b/play-services-appinvite-api new file mode 120000 index 0000000000..e6b639d2f5 --- /dev/null +++ b/play-services-appinvite-api @@ -0,0 +1 @@ +extern/GmsApi/play-services-appinvite-api/ \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 1c0de9b520..0a16720d9b 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -45,8 +45,10 @@ dependencies { implementation project(':play-services-api') implementation project(':play-services-cast-api') implementation project(':play-services-wearable') + implementation project(':play-services-appinvite') implementation project(':unifiednlp-base') implementation project(':wearable-lib') + implementation project(':firebase-dynamic-links') implementation project(':remote-droid-guard-lib') if (useMapbox()) { diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index d47a8abc6f..4521985408 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -651,6 +651,18 @@ + + + + + + + + + + + + @@ -682,6 +694,8 @@ + + diff --git a/play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteService.java b/play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteService.java new file mode 100644 index 0000000000..8270f78ab4 --- /dev/null +++ b/play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteService.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 e Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.microg.gms.appinvite; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; +import android.os.RemoteException; + +import com.google.android.gms.common.api.CommonStatusCodes; +import com.google.android.gms.common.internal.GetServiceRequest; +import com.google.android.gms.common.internal.IGmsCallbacks; + +import org.microg.gms.BaseService; +import org.microg.gms.common.GmsService; +import org.microg.gms.common.PackageUtils; + +import org.microg.gms.appinvite.AppInviteServiceImpl; + +public class AppInviteService extends BaseService { + private static final String TAG = "GmsAppInviteService"; + + public AppInviteService() { + super("GmsAppInviteSvc", GmsService.APP_INVITE); + } + + @Override + public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException { + PackageUtils.getAndCheckCallingPackage(this, request.packageName); + Log.d(TAG, "callb: " + callback + " ; req: " + request + " ; serv: " + service); + + callback.onPostInitComplete(0, new AppInviteServiceImpl(this, request.packageName, request.extras), null); + } +} diff --git a/play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteServiceImpl.java new file mode 100644 index 0000000000..e3bfe6d34c --- /dev/null +++ b/play-services-core/src/main/java/org/microg/gms/appinvite/AppInviteServiceImpl.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2019 e Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.microg.gms.appinvite; + +import android.os.Parcel; +import android.os.RemoteException; +import android.os.Bundle; +import android.app.Activity; +import android.util.Log; +import android.content.Context; +import android.content.Intent; + +import com.google.android.gms.common.api.Status; + +import com.google.android.gms.dynamic.IObjectWrapper; +import com.google.android.gms.dynamic.ObjectWrapper; + +import com.google.android.gms.appinvite.internal.IAppInviteService; +import com.google.android.gms.appinvite.internal.IAppInviteCallbacks; + + +public class AppInviteServiceImpl extends IAppInviteService.Stub { + private static final String TAG = "GmsAppInviteServImpl"; + + public AppInviteServiceImpl(Context context, String packageName, Bundle extras) { + } + + + @Override + public void updateInvitationOnInstall(IAppInviteCallbacks callback, String invitationId) throws RemoteException { + callback.onStatus(Status.SUCCESS); + } + + @Override + public void convertInvitation(IAppInviteCallbacks callback, String invitationId) throws RemoteException { + callback.onStatus(Status.SUCCESS); + } + + @Override + public void getInvitation(IAppInviteCallbacks callback) throws RemoteException { + callback.onStatusIntent(new Status(Activity.RESULT_CANCELED), null); + } + + + @Override + public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { + if (super.onTransact(code, data, reply, flags)) { + return true; + } + + Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); + return false; + } +} diff --git a/play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksService.java b/play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksService.java new file mode 100644 index 0000000000..bb87a6af73 --- /dev/null +++ b/play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksService.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2019 e Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.microg.gms.firebase.dynamiclinks; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; +import android.os.RemoteException; + +import com.google.android.gms.common.api.CommonStatusCodes; +import com.google.android.gms.common.internal.GetServiceRequest; +import com.google.android.gms.common.internal.IGmsCallbacks; + +import org.microg.gms.BaseService; +import org.microg.gms.common.GmsService; +import org.microg.gms.common.PackageUtils; + +import org.microg.gms.firebase.dynamiclinks.DynamicLinksServiceImpl; + +public class DynamicLinksService extends BaseService { + private static final String TAG = "GmsFrbDynamicLinksService"; + + public DynamicLinksService() { + super("GmsFrbDynamicLinksSvc", GmsService.FRB_DYNAMIC_LINKS); + } + + @Override + public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException { + PackageUtils.getAndCheckCallingPackage(this, request.packageName); + Log.d(TAG, "callb: " + callback + " ; req: " + request + " ; serv: " + service); + + callback.onPostInitComplete(0, new DynamicLinksServiceImpl(this, request.packageName, request.extras), null); + } +} diff --git a/play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksServiceImpl.java new file mode 100644 index 0000000000..9db0f8adac --- /dev/null +++ b/play-services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksServiceImpl.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2019 e Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.microg.gms.firebase.dynamiclinks; + +import android.os.Parcel; +import android.os.RemoteException; +import android.os.Bundle; +import android.util.Log; +import android.content.Context; +import android.content.Intent; + +import com.google.android.gms.common.api.Status; +import com.google.android.gms.common.api.CommonStatusCodes; + +import com.google.firebase.dynamiclinks.internal.IDynamicLinksService; +import com.google.firebase.dynamiclinks.internal.IDynamicLinksCallbacks; +import com.google.firebase.dynamiclinks.internal.DynamicLinkData; +import com.google.firebase.dynamiclinks.internal.ShortDynamicLink; + + +public class DynamicLinksServiceImpl extends IDynamicLinksService.Stub { + private static final String TAG = "GmsFrbDynamicLinksServImpl"; + + public DynamicLinksServiceImpl(Context context, String packageName, Bundle extras) { + } + + + @Override + public void getInitialLink(IDynamicLinksCallbacks callback, String var2) throws RemoteException { + callback.onStatusDynamicLinkData(Status.SUCCESS, new DynamicLinkData()); + } + + + @Override + public void func2(IDynamicLinksCallbacks callback, Bundle var2) throws RemoteException { + Log.d(TAG, "func2: " + callback + ", " + var2); + callback.onStatusShortDynamicLink(Status.SUCCESS, new ShortDynamicLink()); + } + + + @Override + public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { + if (super.onTransact(code, data, reply, flags)) { + return true; + } + + Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); + return false; + } +} diff --git a/settings.gradle b/settings.gradle index cf94adba2e..c92e4a2bfc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,10 +12,14 @@ include ':play-services-cast-framework-api' include ':play-services-iid-api' include ':play-services-location-api' include ':play-services-wearable-api' +include ':play-services-appinvite-api' +include ':firebase-dynamic-links-api' include ':play-services-base' include ':play-services-tasks' include ':play-services-wearable' +include ':play-services-appinvite' +include ':firebase-dynamic-links' include ':play-services-maps-core-mapbox' include ':play-services-maps-core-vtm' From 732dfd7729b63eef9243991c3bed07d2c7d4d10c Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Fri, 6 Mar 2020 09:07:23 +0000 Subject: [PATCH 42/46] Added stub for setMapStyleOptions; don't set a member to null because it was still used after onDestroy() --- .../src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt index b31472cb44..cd03858794 100644 --- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt +++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt @@ -436,7 +436,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions) } - override fun snapshot(callback: ISnapshotReadyCallback, bitmap: IObjectWrapper) { + override fun snapshot(callback: ISnapshotReadyCallback, bitmap: IObjectWrapper?) { Log.d(TAG, "unimplemented Method: snapshot") } From 9b9ed816f79198e50633a67dd52df197cfcc3520 Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Fri, 6 Mar 2020 16:53:40 +0000 Subject: [PATCH 43/46] Added stub for setMapStyleOptions; don't set a member to null because it was still used after onDestroy() --- .gitignore | 5 +++++ extern/GmsApi | 2 +- .../org/microg/gms/maps/mapbox/GoogleMap.kt | 19 +++++++++++++++++-- .../org/microg/gms/maps/mapbox/MapView.kt | 1 + .../microg/gms/maps/vtm/GoogleMapImpl.java | 7 +++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 25ed36579e..08f6e53da2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,8 @@ build/ user.gradle local.properties .directory +bin/ +.project +.classpath +.output/ +.settings/ diff --git a/extern/GmsApi b/extern/GmsApi index 09bf949403..c6448e7c55 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit 09bf9494038ab53e0b86d8699db409b955fe3c0c +Subproject commit c6448e7c55ff95c49a6affe2e514ef96b0a30bf3 diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt index b31472cb44..15177118a9 100644 --- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt +++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt @@ -210,6 +210,11 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions) override fun stopAnimation() = map?.cancelTransitions() ?: Unit + override fun setMapStyle(options: MapStyleOptions?): Boolean { + Log.d(TAG, "setMapStyle options: " + options?.getJson()) + return true + } + override fun setMinZoomPreference(minZoom: Float) { map?.setMinZoomPreference(minZoom.toDouble() - 1) } @@ -678,23 +683,33 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions) override fun onResume() = mapView?.onResume() ?: Unit override fun onPause() = mapView?.onPause() ?: Unit override fun onDestroy() { - Log.d(TAG, "destroy"); + Log.d(TAG, "destroy") circleManager?.onDestroy() circleManager = null + lineManager?.onDestroy() lineManager = null + fillManager?.onDestroy() fillManager = null + symbolManager?.onDestroy() symbolManager = null + pendingMarkers.clear() markers.clear() + BitmapDescriptorFactoryImpl.unregisterMap(map) + view.removeView(mapView) + // TODO can crash? mapView?.onDestroy() mapView = null - map = null + + // Don't make it null; this object is not deleted immediately, and it may want to access map.* stuff + //map = null + created = false initialized = false loaded = false diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt index 572eba6f5e..9aa8bfd141 100644 --- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt +++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt @@ -46,6 +46,7 @@ class MapViewImpl(private val context: Context, options: GoogleMapOptions?) : IM override fun onResume() = map?.onResume() ?: Unit override fun onPause() = map?.onPause() ?: Unit override fun onDestroy() { + Log.d(TAG, "destroy") map?.onDestroy() map = null } diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java index b18189a4f1..f16d621f2a 100644 --- a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java +++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java @@ -59,6 +59,7 @@ import com.google.android.gms.maps.model.GroundOverlayOptions; import com.google.android.gms.maps.model.LatLngBounds; import com.google.android.gms.maps.model.MarkerOptions; +import com.google.android.gms.maps.model.MapStyleOptions; import com.google.android.gms.maps.model.PolygonOptions; import com.google.android.gms.maps.model.PolylineOptions; import com.google.android.gms.maps.model.TileOverlayOptions; @@ -210,6 +211,12 @@ public void onExitAmbient() throws RemoteException { } + @Override + public boolean setMapStyle(MapStyleOptions options) throws RemoteException { + Log.d(TAG, "unimplemented Method: setMapStyle"); + return true; + } + @Override public void setMinZoomPreference(float minZoom) throws RemoteException { Log.d(TAG, "unimplemented Method: setMinZoomPreference"); From 8911e1814b5b43d375b20427fddf3a4ea82053e9 Mon Sep 17 00:00:00 2001 From: Manoj Nair Date: Mon, 6 Apr 2020 09:30:04 +0000 Subject: [PATCH 44/46] Added translation using Weblate (Dutch) --- play-services-core/src/main/res/values-nl/strings.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 play-services-core/src/main/res/values-nl/strings.xml diff --git a/play-services-core/src/main/res/values-nl/strings.xml b/play-services-core/src/main/res/values-nl/strings.xml new file mode 100644 index 0000000000..a6b3daec93 --- /dev/null +++ b/play-services-core/src/main/res/values-nl/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 6778968a1fdf5450e0752f004971cf45ad9d2461 Mon Sep 17 00:00:00 2001 From: Anonyme Date: Mon, 6 Apr 2020 15:45:18 +0000 Subject: [PATCH 45/46] Translated using Weblate (French) Currently translated at 100.0% (125 of 125 strings) Translation: /e//GmsCore Translate-URL: https://i18n.e.foundation/projects/e/gmscore/fr/ --- .../src/main/res/values-fr/strings.xml | 76 ++++++++----------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml index 3a9d5cf938..3ffdf81c3d 100644 --- a/play-services-core/src/main/res/values-fr/strings.xml +++ b/play-services-core/src/main/res/values-fr/strings.xml @@ -1,4 +1,5 @@ - - - + --> microG Services Core Paramètres de microG - Juste une seconde… Google - En poursuivant, vous autorisez cette application et Google à utiliser vos informations en accord avec leurs termes de service et politiques de vie privée respectifs. + En poursuivant, vous autorisez cette application et Google à utiliser vos informations en accord avec leurs conditions d\'utilisation et politiques de confidentialité respectifs. %1$s voudrait : %1$s voudrait utiliser : - Gestionnaire du compte Google + Gestionnaire de compte Google Désolé… "Vous n’avez pas de connexion réseau. @@ -38,55 +36,43 @@ Ceci peut prendre plusieurs minutes." Refuser Authentification requise %1$s requiert votre autorisation pour accéder à votre compte Google. - - écouter les diffusions de status internes + écouter les diffusions de statut internes écouter les messages C2DM envoyer des messages C2DM aux autres applications échanger des messages et recevoir des notifications de synchronisation de la part des serveurs de Google Accès étendu aux services Google - Enregistrement du terminal auprès de Google Google Cloud Messaging Google SafetyNet - Désactivé Activé Automatique Manuel - Avancé Aucun - Google Play Jeux %1$s voudrait utiliser Play Jeux Pour utiliser Play Jeux il est requis d’installer l’application Google Play Jeux. L’application peut poursuivre sans Play Jeux, mais il est possible qu’elle se comporte de manière imprévue. - Sélectionner un emplacement La sélection d’emplacement n’est pas encore disponible. Sélectionner cette position - Lieux environnants. + Lieux environnants (%1$.7f, %2$.7f) - - microG Services Core: La permission %1$s est manquante. - + Self check Réseau mobile Wi-Fi - Roaming + Itinérance Autres réseaux - - Support de l’usurpation de signature Paquets installés Système - Le système supporte l’usurpation de signature : Votre ROM ne supporte pas nativement l’usurpation de signature. Vous pouvez néanmoins utiliser Xposed ou d’autres mécanismes pour usurper les signatures. Merci de consulter la documentation sur les ROMs supportant l’usurpation de signature et comment utiliser microG sur les autres. Le système autorise l’usurpation de signature : C’est une indication forte que la ROM supporte l’usurpation de signature mais que celle-ci requiert une action supplémentaire pour être activée. Merci de consulter la documentation sur les éventuelles étapes nécessaires. Le système usurpe la signature : Merci de consulter la documentation sur les éventuelles étapes nécessaires. - Play Services (GmsCore) Play Store (Phonesky) Services Framework (GSF) @@ -94,12 +80,9 @@ Ceci peut prendre plusieurs minutes." Installez l’application %1$s ou tout autre compatible. Merci de consulter la documentation pour obtenir la liste des applications compatibles. %1$s dispose de la bonne signature : Soit l’application %1$s installée n’est pas compatible, soit l’usurpation de signature n’est pas activée pour celle-ci. Merci de consulter la documentation sur les applications et ROMs compatibles. - Optimisations de la batterie ignorées : Appuyez ici pour désactiver les optimisations de la batterie. Des applications peuvent mal se comporter si vous ne le faites pas. - - À propos Composants Configuration @@ -108,23 +91,17 @@ Ceci peut prendre plusieurs minutes." Mode d’opération Services Test - Optimisations de la batterie activées Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour microG Services Core. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie. Désactiver les optimisations de la batterie Autorisations manquantes - Préférences du compte Informations personnelles & vie privée Connexion & sécurité - Faire confiance à Google pour les autorisations des applications Si désactivé, l’utilisateur est interrogé avant que la demande d’autorisation d’une application soit envoyée à Google. Certaines applications échoueront à utiliser le compte Google si ceci est désactivé. - - Enregistre votre terminal auprès des services Google et crée un identifiant unique. microG retire les identifiants autres que le nom de votre compte Google des informations d’enregistrement. - + Enregistre votre terminal auprès des services Google et crée un identifiant unique. microG retire les éléments identifiants autres que le nom de votre compte Google des informations d’enregistrement. Plus - Google Cloud Messaging est un fournisseur de notifications push utilisé par beaucoup d’applications tierces. Pour l’utiliser vous devez activer l’enregistrement du terminal. Intervalle des signaux de présence Cloud Messaging L’intervalle en secondes auquel le système signale sa présence aux serveurs de Google. Augmenter ce nombre réduira la consommation de batterie mais peu induire un délai dans la réception des messages push.\nDéprécié, sera remplacé dans une prochaine version. @@ -133,10 +110,8 @@ Ceci peut prendre plusieurs minutes." Confirmation pour les nouvelles applications Demander avant d’enregistrer une nouvelle application auprès de Google Cloud Messaging Intervalle de ping : %1$s - À propos de microG Services Core Informations de version et librairies utilisées - Erreur lors du désenregistrement Cette application n’est plus installée Désenregistrer @@ -145,25 +120,34 @@ Ceci peut prendre plusieurs minutes." Dernier message : %1$s Enregistrée Enregistrée depuis : %1$s - Désenregistrer %1$s? + Self check Certaines applications ne se réenregistrent pas et/ou ne fournisse pas de moyens de le faire manuellement. Ces applications peuvent ne plus fonctionner correctement après le désenregistrement.\nContinuer ? Vous avez empêché une application déjà enregistrée de s’enregistrer pour recevoir des notifications push.\nVoulez-vous la désenregistrer maintenant pour qu’elle ne reçoive plus de notifications push à l’avenir ? Messages : %1$d (%2$d octets) - Status actuel : Déconnecté - Status actuel : Connecté depuis %1$s - + Statut actuel : Déconnecté + Self check Google SafetyNet est un système de certification du terminal, assurant que celui-ci est correctement sécurisé et compatible avec Android CTS. Certaines applications utilisent SafetyNet pour des raisons de sécurité ou comme prérequis anti-altérations.\n\nmicroG GmsCore contient une implantation libre de SafetyNet, mais les serveurs officiels requièrent que les requêtes SafetyNet soient signées par le système propriétaire DroidGuard. Une version mise en « bac-à-sable » de DroidGuard est disponible dans une application séparée « DroidGuard Helper ». - Tester la certification SafetyNet - Utiliser les serveurs officiels Nécessite un système non-rooté et microG DroidGuard Helper installé Utiliser un serveur tiers - Les serveurs tiers peuvent être capable de répondre aux requêtes SafetyNet sans signature de DroidGuard. - URL serveur tiers + Les serveurs tiers peuvent être capable de répondre aux requêtes SafetyNet sans signature de DroidGuard + URL du serveur tiers URL complète du serveur tiers répondant aux requêtes de certification SafetyNet Utiliser un certificat auto-signé - Au lieu de requérir un serveur, signer les réponses SafetyNet localement en utilisant un certificat auto-signé. La plupart des applications refuseront d’utiliser des réponses auto-signées. - - + Au lieu de solliciter un serveur, signer les réponses SafetyNet localement en utilisant un certificat auto-signé. La plupart des applications refuseront d’utiliser des réponses auto-signées. + certificat auto-signé + serveur tiers + serveur officiel + Ajouter un compte Google + Compte + Si activé, toutes les applications de cet appareil pourront lire l\'adresse mail de vos comptes Google, sans avoir à en demander l\'autorisation. + Autorise les applications à trouver les comptes + Votre appareil établit une connexion aux serveurs de Google pour vous y connecter. +\n +\nCeci peut prendre quelques secondes. + Se connecter + Self check + Configurer microG services Core. + \ No newline at end of file From 20c577a882cfaabc7d10e3af990a9ced7afcff55 Mon Sep 17 00:00:00 2001 From: Anonyme Date: Sun, 12 Apr 2020 13:11:50 +0000 Subject: [PATCH 46/46] Translated using Weblate (French) Currently translated at 100.0% (125 of 125 strings) Translation: /e//GmsCore Translate-URL: https://i18n.e.foundation/projects/e/gmscore/fr/ --- play-services-core/src/main/res/values-fr/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml index 3ffdf81c3d..84453c231e 100644 --- a/play-services-core/src/main/res/values-fr/strings.xml +++ b/play-services-core/src/main/res/values-fr/strings.xml @@ -90,10 +90,10 @@ Ceci peut prendre plusieurs minutes." Service de localisation Mode d’opération Services - Test + Tester Optimisations de la batterie activées Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour microG Services Core. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie. - Désactiver les optimisations de la batterie + Ignorer les optimisations batterie Autorisations manquantes Préférences du compte Informations personnelles & vie privée @@ -111,7 +111,7 @@ Ceci peut prendre plusieurs minutes." Demander avant d’enregistrer une nouvelle application auprès de Google Cloud Messaging Intervalle de ping : %1$s À propos de microG Services Core - Informations de version et librairies utilisées + Informations de version et bibliothèques utilisées Erreur lors du désenregistrement Cette application n’est plus installée Désenregistrer @@ -143,7 +143,7 @@ Ceci peut prendre plusieurs minutes." Ajouter un compte Google Compte Si activé, toutes les applications de cet appareil pourront lire l\'adresse mail de vos comptes Google, sans avoir à en demander l\'autorisation. - Autorise les applications à trouver les comptes + Autoriser les applications à trouver les comptes Votre appareil établit une connexion aux serveurs de Google pour vous y connecter. \n \nCeci peut prendre quelques secondes.