Merge branch 'develop' into release/v3.6.1

Abdoshe · Apr 8, 2019 · cae6e3a · cae6e3a
2 parents 2ff77ed + 6f79b7d
commit cae6e3a
Show file tree

Hide file tree

Showing 29 changed files with 1,490 additions and 1,063 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "mega.privacy.android.app"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 231
-        versionName "3.6.1 (231)"
+        versionCode 227
+        versionName "3.6.0 (227)"
         multiDexEnabled true
     }
 

diff --git a/app/lint.xml b/app/lint.xml
@@ -5,5 +5,5 @@
         <ignore path="res/values-ru/strings.xml" />
         <ignore path="res/values-uk/strings.xml" />
     </issue>
-    <issue id="NewApi" severity="ignore" />
+    <issue id="NewApi" severity="error" />
 </lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mega.privacy.android.app"
     android:installLocation="internalOnly"
-    android:versionCode="231"
-    android:versionName="3.6.1 (231)" >
+    android:versionCode="227"
+    android:versionName="3.6.0 (227)" >
 
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
@@ -480,7 +480,7 @@
         <!-- Used for Google Play Store Campaign Measurement-->
         <service
             android:name="com.google.android.gms.analytics.CampaignTrackingService" />
-
+		<service android:name=".fcm.IncomingMessageService"/>
         <service
             android:name=".jobservices.CameraUploadsService"
             android:permission="android.permission.BIND_JOB_SERVICE"

diff --git a/app/src/main/java/mega/privacy/android/app/MegaApplication.java b/app/src/main/java/mega/privacy/android/app/MegaApplication.java
@@ -98,7 +98,7 @@
 public class MegaApplication extends MultiDexApplication implements MegaGlobalListenerInterface, MegaChatRequestListenerInterface, MegaChatNotificationListenerInterface, MegaChatCallListenerInterface, NetworkStateReceiver.NetworkStateReceiverListener, MegaChatListenerInterface {
 	final String TAG = "MegaApplication";
 
-	static final public String USER_AGENT = "MEGAAndroid/3.6.1_231";
+	static final public String USER_AGENT = "MEGAAndroid/3.6.0_227";
 
 	DatabaseHandler dbH;
 	MegaApiAndroid megaApi;