Dev

.gitignore

@@ -7,3 +7,8 @@ build/
 user.gradle
 local.properties
 .directory
+bin/
+.project
+.classpath
+.output/
+.settings/

.gitlab-ci.yml

@@ -0,0 +1,37 @@
+image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"
+
+stages:
+- build
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+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
+
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+  - .gradle/
+
+build:
+  stage: build
+  script:
+  - 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 -Xmx4096m"
+  - ./gradlew assemble
+  artifacts:
+    paths:
+    - play-services-core/build/outputs/apk/

.gitmodules

@@ -1,15 +1,20 @@
 [submodule "extern/UnifiedNlp"]
 	path = extern/UnifiedNlp
-	url = https://github.com/microg/android_packages_apps_UnifiedNlp.git
+	url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp
+	branch = dev
 [submodule "extern/GmsApi"]
 	path = extern/GmsApi
-	url = https://github.com/microg/android_external_GmsApi.git
+	url = https://gitlab.e.foundation/e/apps/GmsApi
+	branch = dev
 [submodule "extern/Wearable"]
 	path = extern/Wearable
-	url = https://github.com/microg/android_external_Wearable.git
+	url = https://gitlab.e.foundation/e/apps/Wearable
+	branch = dev
 [submodule "extern/GmsLib"]
 	path = extern/GmsLib
-	url = https://github.com/microg/android_external_GmsLib.git
+	url = https://gitlab.e.foundation/e/apps/GmsLib
+	branch = dev
 [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 = dev

firebase-dynamic-links

@@ -0,0 +1 @@
+extern/GmsLib/firebase-dynamic-links

firebase-dynamic-links-api

@@ -0,0 +1 @@
+extern/GmsApi/firebase-dynamic-links-api

gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xms512m -Xmx4096m

play-services-appinvite

@@ -0,0 +1 @@
+extern/GmsLib/play-services-appinvite

play-services-appinvite-api

@@ -0,0 +1 @@
+extern/GmsApi/play-services-appinvite-api/

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()) {
@@ -101,6 +103,10 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     lintOptions {
         disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag'
     }

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

@@ -442,7 +442,7 @@
         </activity>
 
         <!-- microG Settings embedded in System Settings on SDK 23 and newer -->
-        <activity-alias
+        <!--<activity-alias
             android:name="org.microg.gms.ui.SettingsActivityLink"
             android:icon="@drawable/microg_light_color_24"
             android:label="@string/gms_settings_name"
@@ -461,7 +461,7 @@
             <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/gms_settings_summary"/>
-        </activity-alias>
+        </activity-alias> -->
 
         <activity
             android:name="org.microg.gms.ui.AskPushPermission"
@@ -652,6 +652,18 @@
             </intent-filter>
         </service>
 
+        <service android:name="org.microg.gms.appinvite.AppInviteService">
+            <intent-filter>
+                <action android:name="com.google.android.gms.appinvite.service.START"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="org.microg.gms.firebase.dynamiclinks.DynamicLinksService">
+            <intent-filter>
+                <action android:name="com.google.firebase.dynamiclinks.service.START"/>
+            </intent-filter>
+        </service>
+
         <service android:name="org.microg.gms.DummyService">
             <intent-filter>
                 <action android:name="com.google.android.gms.plus.service.START"/>
@@ -683,6 +695,8 @@
                 <action android:name="com.google.android.gms.phenotype.service.START"/>
                 <action android:name="com.google.android.gms.auth.api.credentials.service.START"/>
                 <action android:name="com.google.android.gms.gass.START"/>
+                <action android:name="com.google.android.gms.appinvite.service.START"/>
+                <action android:name="com.google.firebase.dynamiclinks.service.START"/>
             </intent-filter>
         </service>
     </application>

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;
     }

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<String> DISABLED = Collections.singletonList("com.discord");
     private static final List<String> DISABLED = Collections.unmodifiableList(Arrays.asList("com.discord", "com.bankid.bus"));
 
     public static void insertProvider(Context context) {

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);
+    }
+}

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;
+    }
+}

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);

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<CheckinClient.Account> accounts = new ArrayList<CheckinClient.Account>();
         AccountManager accountManager = AccountManager.get(context);

play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java

@@ -57,7 +57,7 @@ public CheckinService() {
     protected void onHandleIntent(Intent intent) {
         try {
             ForegroundServiceContext.completeForegroundService(this, intent, TAG);
-            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));

play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java

@@ -39,7 +39,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;

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);
+    }
+}