Merge pull request #721 from meganz/develop

v3.5.1 (319)

.gitignore

@@ -33,3 +33,5 @@ captures
 ## File-based project format:
 *.ipr
 *.iws
+/.idea/codeStyles/Project.xml
+/.idea/caches/build_file_checksums.ser

app/build.gradle

@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 27
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "mega.privacy.android.app"
-        minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 211
-        versionName "3.4.0 (211)"
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode 219
+        versionName "3.5.1 (219)"
+        multiDexEnabled true
     }
 
     sourceSets.main {
@@ -55,25 +56,32 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.google.android.gms:play-services-wallet:11.6.2'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.github.nirhart:parallaxscroll:1.0'
-    compile 'com.android.support:palette-v7:25.3.1'
-    compile 'io.github.rockerhieu:emojicon:1.4.1'
-    compile 'com.google.firebase:firebase-messaging:11.6.2'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.vdurmont:emoji-java:3.3.0'
-    compile 'com.google.android.exoplayer:exoplayer:2.6.0'
-    compile 'com.google.zxing:core:3.3.1'
-//    compile 'me.dm7.barcodescanner:zxing:1.9.8'
-    compile 'com.budiyev.android:code-scanner:1.8.3'
-    compile "com.squareup.picasso:picasso:2.4.0"
-    compile 'me.leolin:ShortcutBadger:1.1.21@aar'
-    compile 'com.brandongogetap:stickyheaders:0.5.1'
-    compile 'com.github.bumptech.glide:glide:3.8.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.google.android.gms:play-services-wallet:16.0.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.github.nirhart:parallaxscroll:1.0'
+    implementation 'com.android.support:palette-v7:27.1.1'
+    implementation 'io.github.rockerhieu:emojicon:1.4.1'
+    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation 'com.google.firebase:firebase-core:16.0.5'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.vdurmont:emoji-java:3.3.0'
+    implementation 'com.google.android.exoplayer:exoplayer:2.6.0'
+    implementation 'com.google.zxing:core:3.3.2'
+    implementation 'com.budiyev.android:code-scanner:1.8.3'
+    implementation "com.squareup.picasso:picasso:2.4.0"
+    implementation 'me.leolin:ShortcutBadger:1.1.21@aar'
+    implementation 'com.brandongogetap:stickyheaders:0.5.1'
+    implementation 'com.github.bumptech.glide:glide:3.8.0'
+    implementation 'com.github.ittianyu:BottomNavigationViewEx:1.2.4'
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation "com.android.support:support-emoji:27.1.1"
+    implementation 'com.android.support:support-emoji-appcompat:27.1.1'
+    implementation 'com.android.support:support-emoji-bundled:27.1.1'
+    implementation 'com.android.support:preference-v7:27.1.1'
+
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -2,12 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mega.privacy.android.app"
     android:installLocation="internalOnly"
-    android:versionCode="211"
-    android:versionName="3.4.0 (211)" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="25" />
+    android:versionCode="219"
+    android:versionName="3.5.1 (219)" >
 
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
@@ -39,16 +35,21 @@
     <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
     <uses-permission android:name="android.permission.FLAG_SHOW_WHEN_LOCKED" />
     <uses-permission android:name="android.permission.MANAGE_DOCUMENTS"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
 
     <application
-        android:name="MegaApplication"
+        android:name="mega.privacy.android.app.MegaApplication"
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.Megaactionbar" >
 
         <meta-data android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
+        <meta-data
+            android:name="fontProviderRequests"
+            android:value="Noto Color Emoji Compat" />
 
         <activity
             android:name="mega.privacy.android.app.lollipop.LoginActivityLollipop"
@@ -72,7 +73,8 @@
         <activity
             android:name="mega.privacy.android.app.lollipop.ManagerActivityLollipop"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustNothing">
 
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -86,7 +88,8 @@
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megaachievements.AchievementsActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity android:name="OpenLinkActivity" android:launchMode="singleTask" android:screenOrientation="portrait" >
@@ -138,25 +141,32 @@
             android:name="mega.privacy.android.app.lollipop.megachat.ChatFullScreenImageViewer"
             android:label="@string/full_screen_image_viewer_label"
             android:launchMode="singleTop"
-            android:uiOptions="splitActionBarWhenNarrow" >
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/Theme.Swipe.Back">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.ContactFileListActivityLollipop"
             android:label="@string/contact_properties_activity"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.FileContactListActivityLollipop"
             android:label="@string/file_properties_shared_folder_select_contact"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
-       <activity 
+        <activity
             android:name="mega.privacy.android.app.lollipop.FileExplorerActivityLollipop"
-            android:label="@string/app_name">
+            android:launchMode="singleTask"
+            android:label="@string/app_name"
+           android:theme="@style/Theme.Megaactionbar"
+           android:windowSoftInputMode="adjustNothing">
+
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -175,7 +185,8 @@
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.ChatExplorerActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity android:name="mega.privacy.android.app.providers.PinFileProviderActivity"
@@ -184,7 +195,9 @@
 
         <activity android:name="mega.privacy.android.app.providers.FileProviderActivity"
             android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary"
             android:screenOrientation="locked">
+
             <intent-filter>
                 <action
                     android:name="android.intent.action.PICK"/>
@@ -219,7 +232,8 @@
         <activity
             android:name="mega.privacy.android.app.lollipop.FileStorageActivityLollipop"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
@@ -230,104 +244,122 @@
         <activity
             android:name="mega.privacy.android.app.lollipop.FolderLinkActivityLollipop"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.NodeAttachmentActivityLollipop"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.ContactAttachmentActivityLollipop"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.TestPasswordActivity"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.FileLinkActivityLollipop"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.OpenPasswordLinkActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.ChangePasswordActivityLollipop"
-            android:label="@string/my_account_change_password">
+            android:label="@string/my_account_change_password"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.GetLinkActivityLollipop"
             android:configChanges="screenSize|orientation"
-            android:label="@string/context_get_link_menu">
+            android:label="@string/context_get_link_menu"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.SearchByDateActivityLollipop"
-            android:label="@string/action_search_by_date">
+            android:label="@string/action_search_by_date"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.PinLockActivityLollipop"
             android:label="@string/settings_pin_lock"
-            android:windowSoftInputMode="stateVisible">
+            android:windowSoftInputMode="stateVisible"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.ZipBrowserActivityLollipop"
             android:label="@string/zip_browser_activity"
-            android:configChanges="orientation|screenSize" >
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.AddContactActivityLollipop"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Add.Contacts">
+            android:theme="@style/Theme.Add.Contacts"
+            android:windowSoftInputMode="adjustNothing">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.ChatActivityLollipop"
             android:label="@string/app_name"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.ArchivedChatsActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.ContactInfoActivityLollipop"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.FileInfoActivityLollipop"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.VersionsFileActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.GroupChatInfoActivityLollipop"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
@@ -373,13 +405,14 @@
 
         <activity
             android:name="mega.privacy.android.app.lollipop.qrcode.QRCodeActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
             android:name="mega.privacy.android.app.lollipop.TwoFactorAuthenticationActivity"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Megaactionbar.General">
+            android:theme="@style/Theme.Megaactionbar.Secondary">
         </activity>
 
         <activity
@@ -392,7 +425,7 @@
         <activity
             android:name="mega.privacy.android.app.lollipop.megachat.ChatPreferencesActivity"
             android:label="@string/contact_properties_activity"
-            android:theme="@style/Theme.Megaactionbar"
+            android:theme="@style/Theme.Megaactionbar.Secondary"
             android:launchMode="singleTop">
         </activity>
 
@@ -449,6 +482,11 @@
         <service
             android:name="com.google.android.gms.analytics.CampaignTrackingService" />
 
+        <service
+            android:name=".jobservices.CameraUploadsService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false" />
+        <service android:name=".fcm.IncomingCallService" android:exported="true"/>
         <receiver
             android:name="mega.privacy.android.app.receivers.CustomInstallReferrerReceiver"
             android:exported="true">
@@ -507,4 +545,4 @@
         </provider>
     </application>
 
-</manifest>
+</manifest>