Update from android-hacker:master submission

.github/workflows/android.yml

@@ -1,6 +1,6 @@
 name: Android CI
 
-on: [push]
+on: [pull_request, push]
 
 jobs:
   build:
@@ -9,9 +9,20 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+    - name: Checkout submodules
+      uses: srt32/git-actions@v0.0.3
+      with:
+        args: git submodule update --init --recursive
     - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
     - name: Build with Gradle
-      run: cd VirtualApp && ./gradlew build
+      run: cd VirtualApp && ./gradlew assembleRelease
+    - name: ls
+      run: ls
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: compiled
+        path: VirtualApp/app/build/

VirtualApp/app/build.gradle

@@ -1,9 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
-
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-}
 
 Properties properties = new Properties()
 def localProp = file(project.rootProject.file('local.properties'))
@@ -28,8 +23,8 @@ android {
         applicationId "io.va.exposed"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 180
-        versionName "0.18.0"
+        versionCode 182
+        versionName "0.18.2"
         multiDexEnabled false
         android {
             defaultConfig {
@@ -90,9 +85,11 @@ dependencies {
     implementation 'org.jdeferred:jdeferred-android-aar:1.2.4'
     // ThirdParty
     implementation 'com.jonathanfinerty.once:once:1.0.3'
-    aospImplementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
-        transitive = true
-    }
+
+    def appCenterSdkVersion = '3.0.0'
+    aospImplementation("com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}")
+    aospImplementation("com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}")
+
     implementation 'com.kyleduo.switchbutton:library:1.4.6'
     implementation 'com.allenliu.versionchecklib:library:1.8.3'
     implementation 'com.github.medyo:android-about-page:1.2.2'

VirtualApp/app/src/aosp/java/io/virtualapp/delegate/MyCrashHandler.java

@@ -6,12 +6,14 @@
 import android.content.pm.PackageInfo;
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
 import com.lody.virtual.client.VClientImpl;
 import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.os.VUserHandle;
 import com.lody.virtual.remote.InstalledAppInfo;
+import com.microsoft.appcenter.crashes.Crashes;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -27,18 +29,19 @@ public class MyCrashHandler extends BaseCrashHandler {
     public void handleUncaughtException(Thread t, Throwable e) {
         SharedPreferences sp = VirtualCore.get().getContext().getSharedPreferences(CRASH_SP, Context.MODE_MULTI_PROCESS);
 
+        Map<String, String> properties = new HashMap<>();
         try {
             ApplicationInfo currentApplicationInfo = VClientImpl.get().getCurrentApplicationInfo();
             if (currentApplicationInfo != null) {
                 String packageName = currentApplicationInfo.packageName;
                 String processName = currentApplicationInfo.processName;
 
-                Crashlytics.setString("process", processName);
-                Crashlytics.setString("package", packageName);
+                properties.put("process", processName);
+                properties.put("package", packageName);
 
                 int userId = VUserHandle.myUserId();
 
-                Crashlytics.setInt("uid", userId);
+                properties.put("uid", String.valueOf(userId));
 
                 InstalledAppInfo installedAppInfo = VirtualCore.get().getInstalledAppInfo(packageName, 0);
                 if (installedAppInfo != null) {
@@ -47,8 +50,8 @@ public void handleUncaughtException(Thread t, Throwable e) {
                         String versionName = packageInfo.versionName;
                         int versionCode = packageInfo.versionCode;
 
-                        Crashlytics.setString("versionName", versionName);
-                        Crashlytics.setInt("versionCode", versionCode);
+                        properties.put("versionName", versionName);
+                        properties.put("versionCode", String.valueOf(versionCode));
 
                     }
                 }
@@ -64,7 +67,7 @@ public void handleUncaughtException(Thread t, Throwable e) {
         if (exceptionType.equals(lastCrashType) && (now - lastCrash) < TimeUnit.MINUTES.toMillis(1)) {
             // continues crash, do not upload
         } else {
-            Crashlytics.logException(e);
+            Crashes.trackError(e, properties, null);
         }
 
         Log.i(TAG, "uncaught :" + t, e);

VirtualApp/app/src/aosp/java/io/virtualapp/delegate/MyVirtualInitializer.java

@@ -2,10 +2,10 @@
 
 import android.app.Application;
 
-import com.crashlytics.android.Crashlytics;
 import com.lody.virtual.client.core.VirtualCore;
-
-import io.fabric.sdk.android.Fabric;
+import com.microsoft.appcenter.AppCenter;
+import com.microsoft.appcenter.analytics.Analytics;
+import com.microsoft.appcenter.crashes.Crashes;
 
 /**
  * @author weishu
@@ -18,15 +18,17 @@ public MyVirtualInitializer(Application application, VirtualCore core) {
 
     @Override
     public void onMainProcess() {
-        Fabric.with(this.application, new Crashlytics());
+        AppCenter.start(application, "bf5e74bd-3795-49bd-95c8-327db494dd11",
+                Analytics.class, Crashes.class);
         super.onMainProcess();
     }
 
     @Override
     public void onVirtualProcess() {
 
         // For Crash statics
-        Fabric.with(application, new Crashlytics());
+        AppCenter.start(application, "bf5e74bd-3795-49bd-95c8-327db494dd11",
+                Analytics.class, Crashes.class);
 
         super.onVirtualProcess();
 

VirtualApp/app/src/main/AndroidManifest.xml

@@ -26,10 +26,6 @@
             android:value="com.android.support:design:25.4.0"
             tools:replace="android:value" />
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="797c6ad1f87c908a4d7f6e8091e6466848b1611d" />
-
         <activity
             android:name=".splash.SplashActivity"
             android:screenOrientation="portrait"

VirtualApp/app/src/main/java/io/virtualapp/sys/InstallerActivity.java

@@ -179,6 +179,8 @@ private boolean dealUpdate(List<AppInfoLite> appList) {
         }
 
         List<String> magicApps = Arrays.asList(EncodeUtils.decode("Y29tLmxiZS5wYXJhbGxlbA=="), // com.lbe.parallel
+                EncodeUtils.decode("aW8udmlydHVhbGFwcC5zYW5kdnhwb3NlZA=="), // io.virtualapp.sandvxposed
+                EncodeUtils.decode("Y29tLnNrLnNwYXRjaA=="), // com.sk.spatch
                 EncodeUtils.decode("Y29tLnFpaG9vLm1hZ2lj"), // com.qihoo.magic
                 EncodeUtils.decode("Y29tLmRvdWJsZW9wZW4=")); // com.doubleopen