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

Release v5.3

See merge request mobile/android/android!2102

app/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'androidx.navigation.safeargs.kotlin'

app/src/main/AndroidManifest.xml

@@ -41,9 +41,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
 
     <!--<uses-permission android:name="android.permission.READ_CALL_LOG"/>-->
     <!--<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>-->
@@ -696,6 +693,12 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
             android:launchMode="singleTask"/>
 
+        <activity
+            android:name="mega.privacy.android.app.activities.settingsActivities.StartScreenPreferencesActivity"
+            android:label="@string/start_screen_setting"
+            android:launchMode="singleTop">
+        </activity>
+
     </application>
 
 </manifest>

app/src/main/java/mega/privacy/android/app/BaseActivity.java

@@ -1172,13 +1172,32 @@ public AlertDialog getResumeTransfersWarning() {
         return resumeTransfersWarning;
     }
 
+    /**
+     * Checks if should refresh session due to megaApi is null.
+     *
+     * @return True if should refresh session, false otherwise.
+     */
+    protected boolean shouldRefreshSessionDueToMegaApiIsNull() {
+        if (megaApi == null) {
+            logWarning("Refresh session - sdk");
+            refreshSession();
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Checks if should refresh session due to megaApi.
      *
      * @return True if should refresh session, false otherwise.
      */
     protected boolean shouldRefreshSessionDueToSDK() {
-        if (megaApi == null || megaApi.getRootNode() == null) {
+        if (shouldRefreshSessionDueToMegaApiIsNull()) {
+            return true;
+        }
+
+        if (megaApi.getRootNode() == null) {
             logWarning("Refresh session - sdk");
             refreshSession();
             return true;
@@ -1241,43 +1260,21 @@ public void askPermissions(@NotNull String[] permissions, int requestCode) {
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent intent) {
         logDebug("Request code: " + requestCode + ", Result code:" + resultCode);
 
-        switch (requestCode) {
-            case REQUEST_WRITE_STORAGE_FOR_LOGS:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    onRequestWriteStorageForLogs(Environment.isExternalStorageManager());
-                }
-                break;
-
-            case REQUEST_WRITE_STORAGE:
-            case REQUEST_READ_WRITE_STORAGE:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    if (!Environment.isExternalStorageManager()) {
-                        Toast.makeText(this,
-                                StringResourcesUtils.getString(R.string.snackbar_storage_permission_denied_android_11),
-                                Toast.LENGTH_SHORT).show();
-                    }
-                }
-                break;
-
-            case REQ_CODE_BUY:
-                if (resultCode == Activity.RESULT_OK) {
-                    int purchaseResult = billingManager.getPurchaseResult(intent);
+        if (requestCode == REQ_CODE_BUY) {
+            if (resultCode == Activity.RESULT_OK) {
+                int purchaseResult = billingManager.getPurchaseResult(intent);
 
-                    if (BillingManager.ORDER_STATE_SUCCESS == purchaseResult) {
-                        billingManager.updatePurchase();
-                    } else {
-                        logWarning("Purchase failed, error code: " + purchaseResult);
-                    }
+                if (BillingManager.ORDER_STATE_SUCCESS == purchaseResult) {
+                    billingManager.updatePurchase();
                 } else {
-                    logWarning("cancel subscribe");
+                    logWarning("Purchase failed, error code: " + purchaseResult);
                 }
-
-                break;
-
-            default:
-                logWarning("No request code processed");
-                super.onActivityResult(requestCode, resultCode, intent);
-                break;
+            } else {
+                logWarning("cancel subscribe");
+            }
+        } else {
+            logWarning("No request code processed");
+            super.onActivityResult(requestCode, resultCode, intent);
         }
     }
 

app/src/main/java/mega/privacy/android/app/DatabaseHandler.java

@@ -2187,8 +2187,6 @@ public boolean isPasscodeLockEnabled(SQLiteDatabase db){
 	}
 
 	public void setSmallGridCamera (boolean smallGridCamera){
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
         logDebug("setSmallGridCamera");
 
 		String selectQuery = "SELECT * FROM " + TABLE_PREFERENCES;
@@ -2967,8 +2965,6 @@ public void setCamSyncWifi (boolean wifi){
 	}
 
 	public void setPreferredViewList (boolean list){
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
 		String selectQuery = "SELECT * FROM " + TABLE_PREFERENCES;
         ContentValues values = new ContentValues();
 		try (Cursor cursor = db.rawQuery(selectQuery, null)) {
@@ -2986,8 +2982,6 @@ public void setPreferredViewList (boolean list){
 	}
 
 	public void setPreferredViewListCamera (boolean list){
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
 		String selectQuery = "SELECT * FROM " + TABLE_PREFERENCES;
         ContentValues values = new ContentValues();
 		try (Cursor cursor = db.rawQuery(selectQuery, null)) {
@@ -3005,8 +2999,6 @@ public void setPreferredViewListCamera (boolean list){
 	}
 
 	public void setPreferredSortCloud (String order){
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
 		String selectQuery = "SELECT * FROM " + TABLE_PREFERENCES;
 		ContentValues values = new ContentValues();
 		try (Cursor cursor = db.rawQuery(selectQuery, null)) {
@@ -3024,8 +3016,6 @@ public void setPreferredSortCloud (String order){
 	}
 
 	public void setPreferredSortContacts (String order){
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
 		String selectQuery = "SELECT * FROM " + TABLE_PREFERENCES;
 		ContentValues values = new ContentValues();
 		try (Cursor cursor = db.rawQuery(selectQuery, null)) {
@@ -3043,15 +3033,11 @@ public void setPreferredSortContacts (String order){
 	}
 
     public void setPreferredSortCameraUpload(String order) {
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
         logDebug("set sort camera upload order: " + order);
         setStringValue(TABLE_PREFERENCES, KEY_PREFERRED_SORT_CAMERA_UPLOAD, order);
     }
 
 	public void setPreferredSortOthers (String order){
-		if (!MegaApplication.arePreferenceCookiesEnabled()) return;
-
 		String selectQuery = "SELECT * FROM " + TABLE_PREFERENCES;
 		ContentValues values = new ContentValues();
 		try (Cursor cursor = db.rawQuery(selectQuery, null)) {

app/src/main/java/mega/privacy/android/app/MegaApplication.java

@@ -213,7 +213,6 @@ public class MegaApplication extends MultiDexApplication implements Application.
 	private static boolean isLoggingRunning = false;
 	private static boolean isWaitingForCall = false;
 	public static boolean isSpeakerOn = false;
-	private static boolean arePreferenceCookiesEnabled = false;
 	private static boolean areAdvertisingCookiesEnabled = false;
 	private static long userWaitingForCall = MEGACHAT_INVALID_HANDLE;
 
@@ -1009,7 +1008,6 @@ public void checkEnabledCookies() {
 				.observeOn(AndroidSchedulers.mainThread())
 				.subscribe((cookies, throwable) -> {
 					if (throwable == null) {
-						setPreferenceCookiesEnabled(cookies.contains(CookieType.PREFERENCE));
 						setAdvertisingCookiesEnabled(cookies.contains(CookieType.ADVERTISEMENT));
 					}
 				});
@@ -1930,14 +1928,6 @@ public static PasscodeManagement getPasscodeManagement() {
 		return passcodeManagement;
 	}
 
-	public static boolean arePreferenceCookiesEnabled() {
-		return arePreferenceCookiesEnabled;
-	}
-
-	public static void setPreferenceCookiesEnabled(boolean enabled) {
-		arePreferenceCookiesEnabled = enabled;
-	}
-
 	public static boolean areAdvertisingCookiesEnabled() {
 		return areAdvertisingCookiesEnabled;
 	}

app/src/main/java/mega/privacy/android/app/MegaLogger.java

@@ -22,7 +22,7 @@ public abstract class MegaLogger {
 
     public MegaLogger(String fileName) {
         logFile = null;
-        dir = getExternalStoragePath(LOG_DIR);
+        dir = MegaApplication.getInstance().getExternalFilesDir(null).getAbsolutePath() + File.separator + LOG_DIR;
         this.fileName = fileName;
         fileLogQueue = new ConcurrentLinkedDeque<>();
         logToFile();

app/src/main/java/mega/privacy/android/app/ShareInfo.java

@@ -67,6 +67,10 @@ public static ShareInfo infoFromFile(File file) {
 		}
 		return info;
 	}
+
+	public String getOriginalFileName() {
+		return file.getName();
+	}
 
 	public String getFileAbsolutePath() {
 		return file.getAbsolutePath();

app/src/main/java/mega/privacy/android/app/activities/GiphyPickerActivity.kt

@@ -18,7 +18,6 @@ import androidx.core.text.HtmlCompat
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import kotlinx.android.synthetic.main.bottom_sheet_upload.*
 import mega.privacy.android.app.R
 import mega.privacy.android.app.adapters.GiphyAdapter
 import mega.privacy.android.app.databinding.ActivityGiphyBinding

app/src/main/java/mega/privacy/android/app/activities/settingsActivities/StartScreenPreferencesActivity.kt

@@ -0,0 +1,21 @@
+package mega.privacy.android.app.activities.settingsActivities
+
+import android.os.Bundle
+import androidx.fragment.app.commit
+import mega.privacy.android.app.R
+import mega.privacy.android.app.fragments.settingsFragments.startSceen.StartScreenSettingsFragment
+import mega.privacy.android.app.utils.StringResourcesUtils
+
+class StartScreenPreferencesActivity : PreferencesBaseActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        supportActionBar?.subtitle = StringResourcesUtils.getString(R.string.configure_start_screen)
+
+        supportFragmentManager.commit {
+            setReorderingAllowed(true)
+            replace(R.id.fragment_container, StartScreenSettingsFragment())
+        }
+    }
+}

app/src/main/java/mega/privacy/android/app/components/saver/MegaNodeSaving.kt

@@ -2,8 +2,8 @@ package mega.privacy.android.app.components.saver
 
 import android.content.Context
 import android.content.Intent
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.parcel.TypeParceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
 import mega.privacy.android.app.*
 import mega.privacy.android.app.DownloadService.*
 import mega.privacy.android.app.interfaces.SnackbarShower

app/src/main/java/mega/privacy/android/app/components/saver/NodeSaver.kt

@@ -508,7 +508,7 @@ class NodeSaver(
     }
 
     private fun doSave() {
-        if (!saving.downloadToGallery() && Util.askMe(app)) {
+        if (!saving.downloadToGallery() && Util.askMe()) {
             requestLocalFolder(null, activityLauncher)
         } else {
             checkSizeBeforeDownload(

app/src/main/java/mega/privacy/android/app/components/saver/OfflineSaving.kt

@@ -2,7 +2,7 @@ package mega.privacy.android.app.components.saver
 
 import android.content.Context
 import android.content.Intent
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import mega.privacy.android.app.MegaApplication
 import mega.privacy.android.app.MegaOffline
 import mega.privacy.android.app.MimeTypeList

app/src/main/java/mega/privacy/android/app/components/saver/Saving.kt

@@ -2,7 +2,7 @@ package mega.privacy.android.app.components.saver
 
 import android.content.Context
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import mega.privacy.android.app.interfaces.SnackbarShower
 import mega.privacy.android.app.utils.SDCardOperator
 import nz.mega.sdk.MegaApiAndroid

app/src/main/java/mega/privacy/android/app/components/saver/UriSaving.kt

@@ -3,7 +3,7 @@ package mega.privacy.android.app.components.saver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import mega.privacy.android.app.MimeTypeList
 import mega.privacy.android.app.R
 import mega.privacy.android.app.interfaces.SnackbarShower

app/src/main/java/mega/privacy/android/app/constants/EventConstants.kt

@@ -47,9 +47,12 @@ object EventConstants {
     const val EVENT_USER_VISIBILITY_CHANGE = "user_visibility_change"
     const val EVENT_CHAT_CONNECTION_STATUS = "chat_connection_status_change"
 
+    const val EVENT_UPDATE_SCROLL = "EVENT_UPDATE_SCROLL"
     const val EVENT_PERFORM_SCROLL = "EVENT_PERFORM_SCROLL"
     const val EVENT_REFRESH_PHONE_NUMBER = "EVENT_REFRESH_PHONE_NUMBER"
     const val EVENT_PURCHASES_UPDATED = "EVENT_PURCHASES_UPDATED"
     const val EVENT_2FA_UPDATED = "EVENT_2FA_UPDATED"
-    const val EVENT_UPDATE_SCROLL = "EVENT_UPDATE_SCROLL"
+
+    const val EVENT_UPDATE_HIDE_RECENT_ACTIVITY = "EVENT_UPDATE_HIDE_RECENT_ACTIVITY"
+    const val EVENT_UPDATE_START_SCREEN = "EVENT_UPDATE_START_SCREEN"
 }

app/src/main/java/mega/privacy/android/app/constants/SettingsConstants.java

@@ -98,6 +98,10 @@ public class SettingsConstants {
     public static final String KEY_CLEAR_VERSIONS = "settings_file_management_clear_version";
     public static final String KEY_AUTO_PLAY_SWITCH = "auto_play_switch";
 
+    /* User interface settings */
+    public static final String KEY_START_SCREEN = "settings_start_screen";
+    public static final String KEY_HIDE_RECENT_ACTIVITY = "settings_hide_recent_activity";
+
     /* PassCode Lock settings */
     public static final String KEY_PASSCODE_ENABLE = "settings_passcode_enable";
     public static final String KEY_RESET_PASSCODE = "settings_change_passcode";