Merge branch 'release/v4.1.4' into 'master'

Release v4.1.4 See merge request mobile/android/android!1840
meganz · Jun 1, 2021 · 8639bde · 8639bde
2 parents df7ebef + 38cf0d3
commit 8639bde
Show file tree

Hide file tree

Showing 146 changed files with 4,905 additions and 6,074 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -195,7 +195,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.android:flexbox:2.0.1'
     implementation 'jp.wasabeef:blurry:2.1.0'
-    implementation 'com.github.meganz.AndroidDocumentScanner:documentscanner:2.0.7'
+    implementation 'com.github.meganz.AndroidDocumentScanner:documentscanner:2.0.8'
 
     implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion"
     implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -404,6 +404,11 @@
             android:label="@string/app_name">
         </activity>
 
+        <activity
+            android:name="mega.privacy.android.app.lollipop.VerifyTwoFactorActivity"
+            android:label="@string/app_name">
+        </activity>
+
         <activity
             android:name="mega.privacy.android.app.BusinessExpiredAlertActivity"
             android:label="@string/app_name">

diff --git a/app/src/main/java/mega/privacy/android/app/activities/GetLinkActivity.kt b/app/src/main/java/mega/privacy/android/app/activities/GetLinkActivity.kt
@@ -8,7 +8,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View.GONE
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import mega.privacy.android.app.BaseActivity
 import mega.privacy.android.app.R
 import mega.privacy.android.app.components.attacher.MegaAttacher
 import mega.privacy.android.app.databinding.GetLinkActivityLayoutBinding
@@ -28,7 +27,7 @@ import nz.mega.sdk.MegaChatApiJava.MEGACHAT_INVALID_HANDLE
 import nz.mega.sdk.MegaNode
 import java.util.*
 
-class GetLinkActivity : BaseActivity(), GetLinkInterface, SnackbarShower {
+class GetLinkActivity : PasscodeActivity(), GetLinkInterface, SnackbarShower {
     companion object {
         const val GET_LINK_FRAGMENT = 0
         const val COPYRIGHT_FRAGMENT = 1

diff --git a/app/src/main/java/mega/privacy/android/app/activities/OfflineFileInfoActivity.kt b/app/src/main/java/mega/privacy/android/app/activities/OfflineFileInfoActivity.kt
@@ -2,15 +2,14 @@ package mega.privacy.android.app.activities
 
 import android.os.Bundle
 import dagger.hilt.android.AndroidEntryPoint
-import mega.privacy.android.app.BaseActivity
 import mega.privacy.android.app.R
 import mega.privacy.android.app.fragments.offline.OfflineFileInfoFragment
 import mega.privacy.android.app.fragments.offline.OfflineFileInfoFragmentArgs
 import mega.privacy.android.app.utils.Constants.HANDLE
 import mega.privacy.android.app.utils.LogUtil.logError
 
 @AndroidEntryPoint
-class OfflineFileInfoActivity : BaseActivity() {
+class OfflineFileInfoActivity : PasscodeActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_offline_file_info)

diff --git a/app/src/main/java/mega/privacy/android/app/components/saver/NodeSaver.kt b/app/src/main/java/mega/privacy/android/app/components/saver/NodeSaver.kt
@@ -139,6 +139,7 @@ class NodeSaver(
 
     /**
      * Save a list of MegaNode into device.
+     * No matter if the list contains only files, or files and folders.
      *
      * @param handles the handle list of nodes to save
      * @param highPriority whether this download is high priority or not
@@ -155,20 +156,17 @@ class NodeSaver(
     ) {
         save {
             val nodes = ArrayList<MegaNode>()
-            var totalSize = 0L
-
             val api = if (isFolderLink) megaApiFolder else megaApi
 
             for (handle in handles) {
                 val node = api.getNodeByHandle(handle)
                 if (node != null) {
                     nodes.add(node)
-                    totalSize += node.size
                 }
             }
 
             MegaNodeSaving(
-                totalSize, highPriority, isFolderLink, nodes, fromMediaViewer, needSerialize
+                nodesTotalSize(nodes), highPriority, isFolderLink, nodes, fromMediaViewer, needSerialize
             )
         }
     }

diff --git a/app/src/main/java/mega/privacy/android/app/fragments/getLinkFragments/LinkFragment.kt b/app/src/main/java/mega/privacy/android/app/fragments/getLinkFragments/LinkFragment.kt
@@ -342,7 +342,7 @@ class LinkFragment(private val getLinkInterface: GetLinkInterface) : BaseFragmen
         val day = calendar.get(Calendar.DAY_OF_MONTH)
 
         val datePickerDialog = MaterialStyledDatePickerDialog(context,
-            R.style.ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Calendar,
+            R.style.Widget_Mega_DatePickerDialog,
             this, year, month, day)
         datePickerDialog.datePicker.minDate = System.currentTimeMillis() - 1000
         datePickerDialog.show()