Merge pull request #900 from meganz/hotfix/release_v3.6.3

Hotfix/release v3.6.3
meganz · Jul 4, 2019 · 60730ad · 60730ad
2 parents dccdab0 + 302daee
commit 60730ad
Show file tree

Hide file tree

Showing 17 changed files with 125 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "mega.privacy.android.app"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 244
-        versionName "3.6.3 (244)"
+        versionCode 245
+        versionName "3.6.3 (245)"
         multiDexEnabled true
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mega.privacy.android.app"
     android:installLocation="internalOnly"
-    android:versionCode="244"
-    android:versionName="3.6.3 (244)" >
+    android:versionCode="245"
+    android:versionName="3.6.3 (245)" >
 
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
     <uses-feature android:name="android.hardware.camera" android:required="false"/>

diff --git a/app/src/main/java/mega/privacy/android/app/MegaApplication.java b/app/src/main/java/mega/privacy/android/app/MegaApplication.java
@@ -100,7 +100,7 @@
 public class MegaApplication extends MultiDexApplication implements MegaGlobalListenerInterface, MegaChatRequestListenerInterface, MegaChatNotificationListenerInterface, MegaChatCallListenerInterface, NetworkStateReceiver.NetworkStateReceiverListener, MegaChatListenerInterface {
 	final String TAG = "MegaApplication";
 
-	static final public String USER_AGENT = "MEGAAndroid/3.6.3_244";
+	static final public String USER_AGENT = "MEGAAndroid/3.6.3_245";
 
 	DatabaseHandler dbH;
 	MegaApiAndroid megaApi;

diff --git a/app/src/main/java/mega/privacy/android/app/lollipop/ManagerActivityLollipop.java b/app/src/main/java/mega/privacy/android/app/lollipop/ManagerActivityLollipop.java
@@ -67,6 +67,7 @@
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.ActionMode;
 import android.view.Display;
@@ -14676,11 +14677,16 @@ private void checkStorageStatus(int newStorageState, boolean onCreate) {
             case MegaApiJava.STORAGE_STATE_GREEN:
                 log("STORAGE STATE GREEN");
                 intent.setAction(Constants.ACTION_STORAGE_STATE_CHANGED);
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					startForegroundService(intent);
-				} else {
+
+                // TODO: WORKAROUND, NEED TO IMPROVE AND REMOVE THE TRY-CATCH
+                try {
 					startService(intent);
 				}
+				catch (Exception e) {
+					log("Exception starting UploadService: " + e.getMessage());
+					e.printStackTrace();
+				}
+
 				int accountType = ((MegaApplication) getApplication()).getMyAccountInfo().getAccountType();
 				if(accountType == MegaAccountDetails.ACCOUNT_TYPE_FREE){
 					log("ACCOUNT TYPE FREE");
@@ -14694,11 +14700,16 @@ private void checkStorageStatus(int newStorageState, boolean onCreate) {
 			case MegaApiJava.STORAGE_STATE_ORANGE:
 				log("STORAGE STATE ORANGE");
                 intent.setAction(Constants.ACTION_STORAGE_STATE_CHANGED);
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					startForegroundService(intent);
-				} else {
+
+				// TODO: WORKAROUND, NEED TO IMPROVE AND REMOVE THE TRY-CATCH
+                try {
 					startService(intent);
 				}
+				catch (Exception e) {
+					log("Exception starting UploadService: " + e.getMessage());
+					e.printStackTrace();
+				}
+
 				if (onCreate && isStorageStatusDialogShown) {
 					isStorageStatusDialogShown = false;
 					showStorageAlmostFullDialog();

diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
@@ -0,0 +1,69 @@
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#2196F3" android:fillType="evenOdd"
+        android:pathData="M0,0h108v108h-108z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M99,0L99,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M89,0L89,108" android:strokeAlpha="0.3"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M79,0L79,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M69,0L69,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M59,0L59,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M49,0L49,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M39,0L39,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M29,0L29,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M19,0L19,108" android:strokeAlpha="0.3"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M9,0L9,108" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,99L108,99" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,89L108,89" android:strokeAlpha="0.3"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,79L108,79" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,69L108,69" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,59L108,59" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,49L108,49" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,39L108,39" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,29L108,29" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,19L108,19" android:strokeAlpha="0.3"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M0,9L108,9" android:strokeAlpha="0.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
+    <path android:fillColor="#F30C14" android:fillType="evenOdd"
+        android:pathData="M0,0h108v108h-108z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
@@ -0,0 +1,33 @@
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillType="evenOdd"
+        android:pathData="M36.5,68.5l39.5,39.5l32,0l0,-31l-36,-35.5l-18,18l-15,-15z"
+        android:strokeAlpha="0.5" android:strokeColor="#00000000" android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="9.603655"
+                android:centerY="60.71905"
+                android:gradientRadius="80.23283" android:type="radial">
+                <item android:color="#26000000" android:offset="0"/>
+                <item android:color="#26000000" android:offset="0.14151114"/>
+                <item android:color="#05000000" android:offset="0.64340156"/>
+                <item android:color="#00000000" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#FFFFFF" android:fillType="evenOdd"
+        android:pathData="M72,67.42C72,68.027 71.527,68.5 70.943,68.5L66.397,68.5C65.813,68.5 65.34,68.027 65.34,67.42L65.34,53.313C65.34,53.177 65.183,53.132 65.115,53.2L55.507,62.92C54.675,63.775 53.325,63.775 52.493,62.92L42.885,53.2C42.818,53.132 42.66,53.177 42.66,53.313L42.66,67.42C42.66,68.027 42.188,68.5 41.603,68.5L37.057,68.5C36.472,68.5 36,68.027 36,67.42L36,42.58C36,41.972 36.472,41.5 37.057,41.5L40.185,41.5C40.748,41.5 41.287,41.725 41.693,42.13L53.618,54.213C53.82,54.415 54.18,54.415 54.382,54.213L66.308,42.13C66.713,41.725 67.253,41.5 67.815,41.5L70.943,41.5C71.527,41.5 72,41.972 72,42.58L72,67.42"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillType="evenOdd"
+        android:pathData="M0,0h108v108h-108z"
+        android:strokeColor="#00000000" android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="29.740786"
+                android:centerY="29.68447"
+                android:gradientRadius="71.148445" android:type="radial">
+                <item android:color="#19FFFFFF" android:offset="0"/>
+                <item android:color="#00FFFFFF" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_background.png b/app/src/main/res/drawable-hdpi/ic_launcher_background.png
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_background.png b/app/src/main/res/drawable-mdpi/ic_launcher_background.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_background.png b/app/src/main/res/drawable-xhdpi/ic_launcher_background.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/values/strings_donottranslate.xml b/app/src/main/res/values/strings_donottranslate.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name" context="Name of the app" translatable="false">MEGA</string>
     <string name="pdf_app_name" context="PDF viewer app name" translatable="false">MEGA PDF Viewer</string>
-    <string name="app_version" context="Version number of the app" translatable="false">3.6.3 (244)</string>
+    <string name="app_version" context="Version number of the app" translatable="false">3.6.3 (245)</string>
     <string name="sdk_version" context="SDK version" translatable="false">b668402</string>
     <string name="karere_version" context="MEGAchat SDK version" translatable="false">ea276c4</string>
     <string name="prolite_account" context="PRO Lite account" translatable="false">Lite</string>