Commit 13c267d5 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'dev' into 'master'

[RELEASE] Sprint Freetown

See merge request !14
parents d20d93a9 c34da53c
Pipeline #40853 passed with stage
in 5 minutes and 50 seconds
......@@ -3,6 +3,9 @@ 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 )'
......@@ -23,12 +26,11 @@ 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
- export TERM=dumb
- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m"
- ./gradlew assemble
artifacts:
paths:
......
[submodule "extern/UnifiedNlp"]
path = extern/UnifiedNlp
url = ../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
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6
Subproject commit 09bf9494038ab53e0b86d8699db409b955fe3c0c
Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792
Subproject commit 614e111fa02b9aeb195879735ababe869074617c
Subproject commit 47073dd7a2a039593fe556af8f9f33e325febfa7
Subproject commit 0c5c944a54962a4c60cffa44785a36d7251df635
Subproject commit 2c56cdcb7e0de2c88d0acb80727534b73dccf9e2
Subproject commit 5516c49cb40d5008bd76a0818bb856da1b134f05
extern/GmsLib/firebase-dynamic-links
\ No newline at end of file
extern/GmsApi/firebase-dynamic-links-api
\ No newline at end of file
org.gradle.jvmargs=-Xms512m -Xmx4096m
extern/GmsLib/play-services-appinvite
\ No newline at end of file
extern/GmsApi/play-services-appinvite-api/
\ No newline at end of file
......@@ -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()) {
......
......@@ -651,6 +651,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"/>
......@@ -682,6 +694,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>
......
/*
* 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);
}
}
/*
* 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;
}
}
/*
* 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);
}
}
/*
* 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;
}
}
......@@ -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'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment