Merge pull request #1625 from meganz/release/v4.0.0

Release v4.0.0

app/build.gradle

@@ -19,8 +19,8 @@ android {
 
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 350
-        versionName "3.8.5 (350)"
+        versionCode 352
+        versionName "4.0.0 (352)"
 
         multiDexEnabled true
         ndk.abiFilters 'armeabi-v7a','x86', 'x86_64', 'arm64-v8a'
@@ -77,6 +77,17 @@ android {
 //    tasks.withType(JavaCompile) {
 //        compileTask -> compileTask.dependsOn megaSDK
 //    }
+
+    flavorDimensions "service"
+    productFlavors {
+        gms {
+            dimension "service"
+        }
+        hms {
+            dimension "service"
+            applicationId = "mega.privacy.android.app.huawei"
+        }
+    }
 }
 
 dependencies {
@@ -104,6 +115,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
 
     implementation "androidx.navigation:navigation-runtime-ktx:$navigationVersion"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
@@ -122,11 +135,11 @@ dependencies {
     // Other libs
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.0'
-    implementation 'com.google.android.gms:play-services-wallet:18.1.1'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.github.nirhart:parallaxscroll:1.0'
     implementation 'androidx.palette:palette:1.0.0'
-    implementation 'com.google.firebase:firebase-messaging:20.3.0'
-    implementation 'com.google.firebase:firebase-core:17.5.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.vdurmont:emoji-java:4.0.0'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.11.8'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.8'
@@ -141,38 +154,50 @@ dependencies {
     implementation 'androidx.emoji:emoji-appcompat:1.1.0'
     implementation 'androidx.emoji:emoji-bundled:1.1.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.gms:play-services-location:17.1.0'
-    implementation 'com.google.android.gms:play-services-maps:17.0.0'
-    implementation 'com.google.maps.android:android-maps-utils:0.5'
     implementation 'io.supercharge:shimmerlayout:2.1.0'
     implementation 'net.opacapp:multiline-collapsingtoolbar:27.1.1'
     implementation 'com.github.tony19:named-regexp:0.2.5'
     implementation 'org.hamcrest:hamcrest-library:1.3'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'jp.wasabeef:blurry:2.1.0'
-    implementation 'com.android.billingclient:billing:3.0.1'
 
     implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion"
     implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion"
+    implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
     implementation "org.jetbrains.anko:anko-commons:$ankoVersion"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
 
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0'
-
     implementation "com.facebook.fresco:fresco:$frescoVersion"
     implementation "com.facebook.fresco:animated-gif:$frescoVersion"
     implementation "com.facebook.fresco:animated-webp:$frescoVersion"
     implementation "com.facebook.fresco:webpsupport:$frescoVersion"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-    implementation 'io.reactivex.rxjava3:rxjava:3.0.4'
     implementation "org.jetbrains.anko:anko-commons:$ankoVersion"
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+
+    //GMS
+    gmsImplementation 'com.google.firebase:firebase-core:18.0.0'
+    gmsImplementation 'com.google.firebase:firebase-messaging:21.0.1'
+    gmsImplementation 'com.android.billingclient:billing:3.0.2'
+    gmsImplementation 'com.google.android.gms:play-services-location:17.1.0'
+    gmsImplementation 'com.google.android.gms:play-services-maps:17.0.0'
+    gmsImplementation 'com.google.maps.android:android-maps-utils:0.5'
+
+    //HMS
+    hmsImplementation 'com.huawei.hms:push:4.0.2.300'
+    hmsImplementation 'com.huawei.hms:location:4.0.2.300'
+    hmsImplementation 'com.huawei.hms:maps:4.0.1.301'
+    hmsImplementation 'com.huawei.hms:iap:4.0.2.300'
 }
 
-apply plugin: 'com.google.gms.google-services'
+def taskRequests = gradle.getStartParameter().getTaskRequests().toString()
+if (taskRequests.contains("Hms")) {
+    apply plugin: 'com.huawei.agconnect'
+} else if (taskRequests.contains("Gms")) {
+    apply plugin: 'com.google.gms.google-services'
+}

app/proguard-rules.pro

@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.hianalytics.android.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}

app/src/gms/AndroidManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="mega.privacy.android.app"
+          android:installLocation="internalOnly">
+
+    <application tools:node="merge">
+
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+
+        <!--
+        The API key for Google Maps-based APIs is defined as a string resource.
+        (See the file "res/values/google_maps_api.xml").
+        Note that the API key is linked to the encryption key used to sign the APK.
+        You need a different API key for each encryption key, including the release key that is used to
+        sign the APK for publishing.
+        You can define the keys for the debug and release targets in src/debug/ and src/release/.
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
+
+        <service
+            android:name=".service.push.MegaMessageService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+    </application>
+
+</manifest>