Merge branch 'release/v5.5' into 'master'

Release v5.5 See merge request mobile/android/android!2179
meganz · Dec 20, 2021 · fde83b3 · fde83b3
2 parents 42859a0 + 245d28c
commit fde83b3
Show file tree

Hide file tree

Showing 138 changed files with 3,118 additions and 2,480 deletions.
diff --git a/app/src/main/java/mega/privacy/android/app/BaseActivity.java b/app/src/main/java/mega/privacy/android/app/BaseActivity.java
@@ -48,9 +48,11 @@
 import dagger.hilt.android.AndroidEntryPoint;
 import kotlin.Pair;
 import kotlin.Suppress;
+import mega.privacy.android.app.components.saver.AutoPlayInfo;
 import mega.privacy.android.app.globalmanagement.MyAccountInfo;
 import mega.privacy.android.app.interfaces.ActivityLauncher;
 import mega.privacy.android.app.interfaces.PermissionRequester;
+import mega.privacy.android.app.interfaces.SnackbarShower;
 import mega.privacy.android.app.listeners.ChatLogoutListener;
 import mega.privacy.android.app.lollipop.LoginActivityLollipop;
 import mega.privacy.android.app.lollipop.ManagerActivityLollipop;
@@ -65,6 +67,7 @@
 import mega.privacy.android.app.service.iar.RatingHandlerImpl;
 import mega.privacy.android.app.smsVerification.SMSVerificationActivity;
 import mega.privacy.android.app.snackbarListeners.SnackbarNavigateOption;
+import mega.privacy.android.app.utils.MegaNodeUtil;
 import mega.privacy.android.app.utils.PermissionUtils;
 import mega.privacy.android.app.utils.ColorUtils;
 import mega.privacy.android.app.utils.StringResourcesUtils;
@@ -96,7 +99,7 @@
 import java.util.List;
 
 @AndroidEntryPoint
-public class BaseActivity extends AppCompatActivity implements ActivityLauncher, PermissionRequester,
+public class BaseActivity extends AppCompatActivity implements ActivityLauncher, PermissionRequester, SnackbarShower,
         BillingUpdatesListener {
 
     private static final String EXPIRED_BUSINESS_ALERT_SHOWN = "EXPIRED_BUSINESS_ALERT_SHOWN";
@@ -132,6 +135,11 @@ public class BaseActivity extends AppCompatActivity implements ActivityLauncher,
     private AlertDialog transferGeneralOverQuotaWarning;
     private Snackbar snackbar;
 
+    /**
+     * Contains the info of a node that to be opened in-app.
+     */
+    private AutoPlayInfo autoPlayInfo;
+
     /**
      * Load the psa in the web browser fragment if the psa is a web one and this activity
      * is on the top of the task stack
@@ -463,23 +471,37 @@ public void onReceive(Context context, Intent intent) {
                 return;
             }
 
-            String message = null;
             int numTransfers = intent.getIntExtra(NUMBER_FILES, 1);
+            String message = getResources().getQuantityString(R.plurals.download_finish, numTransfers, numTransfers);
 
             switch (intent.getStringExtra(TRANSFER_TYPE)) {
                 case DOWNLOAD_TRANSFER:
-                    message = getResources().getQuantityString(R.plurals.download_finish, numTransfers, numTransfers);
+                    Util.showSnackbar(baseActivity, message);
                     break;
 
                 case UPLOAD_TRANSFER:
                     message = getResources().getQuantityString(R.plurals.upload_finish, numTransfers, numTransfers);
+                    Util.showSnackbar(baseActivity, message);
                     break;
-            }
 
-            Util.showSnackbar(baseActivity, message);
+                case DOWNLOAD_TRANSFER_OPEN:
+                    autoPlayInfo = new AutoPlayInfo(intent.getStringExtra(NODE_NAME), intent.getLongExtra(NODE_HANDLE, INVALID_VALUE), intent.getStringExtra(NODE_LOCAL_PATH), true);
+                    showSnackbar(OPEN_FILE_SNACKBAR_TYPE, message, MEGACHAT_INVALID_HANDLE);
+                    break;
+            }
         }
     };
 
+    /**
+     * Open the downloaded file.
+     */
+    private void openDownloadedFile() {
+        if(autoPlayInfo != null) {
+            MegaNodeUtil.autoPlayNode(BaseActivity.this, autoPlayInfo, BaseActivity.this,BaseActivity.this);
+            autoPlayInfo = null;
+        }
+    }
+
     private BroadcastReceiver showSnackbarReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -819,6 +841,12 @@ public void showSnackbar (int type, View view, View anchor, String s, long idCha
                 snackbar.setAction(R.string.general_ok, new SnackbarNavigateOption(view.getContext(), type));
                 snackbar.show();
                 break;
+
+            case OPEN_FILE_SNACKBAR_TYPE: {
+                snackbar.setAction(R.string.action_see, (v) -> openDownloadedFile());
+                snackbar.show();
+                break;
+            }
         }
     }
 
@@ -1376,4 +1404,10 @@ public void onQueryPurchasesFinished(boolean isFailed, int resultCode, List<Mega
         updateAccountInfo(this, purchases, myAccountInfo);
         updateSubscriptionLevel(myAccountInfo, dbH, megaApi);
     }
+
+    @Override
+    public void showSnackbar(int type, @Nullable String content, long chatId) {
+        View rootView = getRootViewFromContext(this);
+        showSnackbar(type, rootView, content, chatId);
+    }
 }