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

Release v4.2.0 See merge request mobile/android/android!1877
meganz · Jul 12, 2021 · 0c52798 · 0c52798
2 parents d56d555 + 6cc33cb
commit 0c52798
Show file tree

Hide file tree

Showing 152 changed files with 3,231 additions and 3,720 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -50,7 +50,8 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_mega_round"
         android:theme="@style/Theme.Mega"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:screenOrientation="fullUser">
 
         <meta-data
             android:name="fontProviderRequests"
@@ -284,11 +285,6 @@
             android:label="@string/context_get_link_menu">
         </activity>
 
-        <activity
-            android:name="mega.privacy.android.app.lollipop.SearchByDateActivityLollipop"
-            android:label="@string/action_search_by_date">
-        </activity>
-
         <activity
             android:name="mega.privacy.android.app.activities.settingsActivities.PasscodeLockActivity"
             android:label="@string/settings_passcode_lock"
@@ -639,6 +635,11 @@
             </intent-filter>
         </receiver>
 
+        <activity
+            android:name=".activities.AskForDisplayOverActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"/>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/mega/privacy/android/app/DownloadService.java b/app/src/main/java/mega/privacy/android/app/DownloadService.java
@@ -1566,7 +1566,7 @@ private void doOnTransferFinish(MegaTransfer transfer, MegaError error) {
 						if (videoNode != null){
 							if(!videoNode.hasThumbnail()){
                                 logDebug("The video has not thumb");
-								ThumbnailUtilsLollipop.createThumbnailVideo(this, transfer.getPath(), megaApi, transfer.getNodeHandle());
+								ThumbnailUtilsLollipop.createThumbnailVideo(this, path, megaApi, transfer.getNodeHandle());
 							}
 						}
 						else{
@@ -1589,7 +1589,7 @@ private void doOnTransferFinish(MegaTransfer transfer, MegaError error) {
 						alterDocument(tranfersUri, node.getName());
 					}
 
-					if(transfer.getPath().contains(OFFLINE_DIR)){
+					if(!isTextEmpty(path) && path.contains(OFFLINE_DIR)){
 						logDebug("It is Offline file");
 						dbH = DatabaseHandler.getDbHandler(getApplicationContext());
 						offlineNode = megaApi.getNodeByHandle(transfer.getNodeHandle());

diff --git a/app/src/main/java/mega/privacy/android/app/activities/AskForDisplayOverActivity.kt b/app/src/main/java/mega/privacy/android/app/activities/AskForDisplayOverActivity.kt
@@ -0,0 +1,65 @@
+package mega.privacy.android.app.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Color
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.view.View
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import mega.privacy.android.app.DatabaseHandler
+import mega.privacy.android.app.R
+
+/**
+ * A dialog style activity can lead to system setting page.
+ * Launched by notification even when the app is killed.
+ *
+ * @see mega.privacy.android.app.utils.IncomingCallNotification.toSystemSettingNotification
+ */
+@RequiresApi(Build.VERSION_CODES.M)
+class AskForDisplayOverActivity : Activity(), View.OnClickListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.statusBarColor = Color.TRANSPARENT
+        setContentView(R.layout.ask_for_display_over_activity_layout)
+    }
+
+    /**
+     * Close the activity.
+     */
+    fun notNow() {
+        // This will keep showing after the activity is destroyed, so can't use snack bar.
+        Toast.makeText(this, R.string.ask_for_display_over_explain, Toast.LENGTH_LONG).show()
+        finish()
+    }
+
+    /**
+     * Launch system setting page by implicit intent.
+     */
+    fun toSetting() {
+        val intent = Intent(
+            Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+            Uri.parse("package:$packageName")
+        )
+
+        startActivity(intent)
+
+        finish()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        DatabaseHandler.getDbHandler(this).dontAskForDisplayOver()
+    }
+
+    override fun onClick(v: View) {
+        when (v.id) {
+            R.id.btn_not_now -> notNow()
+            R.id.btn_allow -> toSetting()
+        }
+    }
+}