Skip to content

Commit 60730ad

Browse files
ygaoyygaoy
authored
Merge pull request #900 from meganz/hotfix/release_v3.6.3
Hotfix/release v3.6.3
2 parents dccdab0 + 302daee commit 60730ad

17 files changed

+125
-12
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "mega.privacy.android.app"
99
minSdkVersion 21
1010
targetSdkVersion 27
11-
versionCode 244
12-
versionName "3.6.3 (244)"
11+
versionCode 245
12+
versionName "3.6.3 (245)"
1313
multiDexEnabled true
1414
}
1515

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="mega.privacy.android.app"
44
android:installLocation="internalOnly"
5-
android:versionCode="244"
6-
android:versionName="3.6.3 (244)" >
5+
android:versionCode="245"
6+
android:versionName="3.6.3 (245)" >
77

88
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
99
<uses-feature android:name="android.hardware.camera" android:required="false"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
public class MegaApplication extends MultiDexApplication implements MegaGlobalListenerInterface, MegaChatRequestListenerInterface, MegaChatNotificationListenerInterface, MegaChatCallListenerInterface, NetworkStateReceiver.NetworkStateReceiverListener, MegaChatListenerInterface {
101101
final String TAG = "MegaApplication";
102102

103-
static final public String USER_AGENT = "MEGAAndroid/3.6.3_244";
103+
static final public String USER_AGENT = "MEGAAndroid/3.6.3_245";
104104

105105
DatabaseHandler dbH;
106106
MegaApiAndroid megaApi;

‎app/src/main/java/mega/privacy/android/app/lollipop/ManagerActivityLollipop.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import android.text.TextUtils;
6868
import android.text.TextWatcher;
6969
import android.util.DisplayMetrics;
70+
import android.util.Log;
7071
import android.util.TypedValue;
7172
import android.view.ActionMode;
7273
import android.view.Display;
@@ -14676,11 +14677,16 @@ private void checkStorageStatus(int newStorageState, boolean onCreate) {
1467614677
case MegaApiJava.STORAGE_STATE_GREEN:
1467714678
log("STORAGE STATE GREEN");
1467814679
intent.setAction(Constants.ACTION_STORAGE_STATE_CHANGED);
14679-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
14680-
startForegroundService(intent);
14681-
} else {
14680+
14681+
// TODO: WORKAROUND, NEED TO IMPROVE AND REMOVE THE TRY-CATCH
14682+
try {
1468214683
startService(intent);
1468314684
}
14685+
catch (Exception e) {
14686+
log("Exception starting UploadService: " + e.getMessage());
14687+
e.printStackTrace();
14688+
}
14689+
1468414690
int accountType = ((MegaApplication) getApplication()).getMyAccountInfo().getAccountType();
1468514691
if(accountType == MegaAccountDetails.ACCOUNT_TYPE_FREE){
1468614692
log("ACCOUNT TYPE FREE");
@@ -14694,11 +14700,16 @@ private void checkStorageStatus(int newStorageState, boolean onCreate) {
1469414700
case MegaApiJava.STORAGE_STATE_ORANGE:
1469514701
log("STORAGE STATE ORANGE");
1469614702
intent.setAction(Constants.ACTION_STORAGE_STATE_CHANGED);
14697-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
14698-
startForegroundService(intent);
14699-
} else {
14703+
14704+
// TODO: WORKAROUND, NEED TO IMPROVE AND REMOVE THE TRY-CATCH
14705+
try {
1470014706
startService(intent);
1470114707
}
14708+
catch (Exception e) {
14709+
log("Exception starting UploadService: " + e.getMessage());
14710+
e.printStackTrace();
14711+
}
14712+
1470214713
if (onCreate && isStorageStatusDialogShown) {
1470314714
isStorageStatusDialogShown = false;
1470414715
showStorageAlmostFullDialog();

‎app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<vector android:height="24dp" android:viewportHeight="108"
2+
android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="#2196F3" android:fillType="evenOdd"
4+
android:pathData="M0,0h108v108h-108z"
5+
android:strokeColor="#00000000" android:strokeWidth="1"/>
6+
<path android:fillColor="#00000000" android:fillType="evenOdd"
7+
android:pathData="M99,0L99,108" android:strokeAlpha="0.6"
8+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
9+
<path android:fillColor="#00000000" android:fillType="evenOdd"
10+
android:pathData="M89,0L89,108" android:strokeAlpha="0.3"
11+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
12+
<path android:fillColor="#00000000" android:fillType="evenOdd"
13+
android:pathData="M79,0L79,108" android:strokeAlpha="0.6"
14+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
15+
<path android:fillColor="#00000000" android:fillType="evenOdd"
16+
android:pathData="M69,0L69,108" android:strokeAlpha="0.6"
17+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
18+
<path android:fillColor="#00000000" android:fillType="evenOdd"
19+
android:pathData="M59,0L59,108" android:strokeAlpha="0.6"
20+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
21+
<path android:fillColor="#00000000" android:fillType="evenOdd"
22+
android:pathData="M49,0L49,108" android:strokeAlpha="0.6"
23+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
24+
<path android:fillColor="#00000000" android:fillType="evenOdd"
25+
android:pathData="M39,0L39,108" android:strokeAlpha="0.6"
26+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
27+
<path android:fillColor="#00000000" android:fillType="evenOdd"
28+
android:pathData="M29,0L29,108" android:strokeAlpha="0.6"
29+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
30+
<path android:fillColor="#00000000" android:fillType="evenOdd"
31+
android:pathData="M19,0L19,108" android:strokeAlpha="0.3"
32+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
33+
<path android:fillColor="#00000000" android:fillType="evenOdd"
34+
android:pathData="M9,0L9,108" android:strokeAlpha="0.6"
35+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
36+
<path android:fillColor="#00000000" android:fillType="evenOdd"
37+
android:pathData="M0,99L108,99" android:strokeAlpha="0.6"
38+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
39+
<path android:fillColor="#00000000" android:fillType="evenOdd"
40+
android:pathData="M0,89L108,89" android:strokeAlpha="0.3"
41+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
42+
<path android:fillColor="#00000000" android:fillType="evenOdd"
43+
android:pathData="M0,79L108,79" android:strokeAlpha="0.6"
44+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
45+
<path android:fillColor="#00000000" android:fillType="evenOdd"
46+
android:pathData="M0,69L108,69" android:strokeAlpha="0.6"
47+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
48+
<path android:fillColor="#00000000" android:fillType="evenOdd"
49+
android:pathData="M0,59L108,59" android:strokeAlpha="0.6"
50+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
51+
<path android:fillColor="#00000000" android:fillType="evenOdd"
52+
android:pathData="M0,49L108,49" android:strokeAlpha="0.6"
53+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
54+
<path android:fillColor="#00000000" android:fillType="evenOdd"
55+
android:pathData="M0,39L108,39" android:strokeAlpha="0.6"
56+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
57+
<path android:fillColor="#00000000" android:fillType="evenOdd"
58+
android:pathData="M0,29L108,29" android:strokeAlpha="0.6"
59+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
60+
<path android:fillColor="#00000000" android:fillType="evenOdd"
61+
android:pathData="M0,19L108,19" android:strokeAlpha="0.3"
62+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
63+
<path android:fillColor="#00000000" android:fillType="evenOdd"
64+
android:pathData="M0,9L108,9" android:strokeAlpha="0.6"
65+
android:strokeColor="#FFFFFF" android:strokeWidth="0.4"/>
66+
<path android:fillColor="#F30C14" android:fillType="evenOdd"
67+
android:pathData="M0,0h108v108h-108z"
68+
android:strokeColor="#00000000" android:strokeWidth="1"/>
69+
</vector>

‎app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<vector android:height="24dp" android:viewportHeight="108"
2+
android:viewportWidth="108" android:width="24dp"
3+
xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillAlpha="0.5" android:fillType="evenOdd"
5+
android:pathData="M36.5,68.5l39.5,39.5l32,0l0,-31l-36,-35.5l-18,18l-15,-15z"
6+
android:strokeAlpha="0.5" android:strokeColor="#00000000" android:strokeWidth="1">
7+
<aapt:attr name="android:fillColor">
8+
<gradient android:centerX="9.603655"
9+
android:centerY="60.71905"
10+
android:gradientRadius="80.23283" android:type="radial">
11+
<item android:color="#26000000" android:offset="0"/>
12+
<item android:color="#26000000" android:offset="0.14151114"/>
13+
<item android:color="#05000000" android:offset="0.64340156"/>
14+
<item android:color="#00000000" android:offset="1"/>
15+
</gradient>
16+
</aapt:attr>
17+
</path>
18+
<path android:fillColor="#FFFFFF" android:fillType="evenOdd"
19+
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"
20+
android:strokeColor="#00000000" android:strokeWidth="1"/>
21+
<path android:fillType="evenOdd"
22+
android:pathData="M0,0h108v108h-108z"
23+
android:strokeColor="#00000000" android:strokeWidth="1">
24+
<aapt:attr name="android:fillColor">
25+
<gradient android:centerX="29.740786"
26+
android:centerY="29.68447"
27+
android:gradientRadius="71.148445" android:type="radial">
28+
<item android:color="#19FFFFFF" android:offset="0"/>
29+
<item android:color="#00FFFFFF" android:offset="1"/>
30+
</gradient>
31+
</aapt:attr>
32+
</path>
33+
</vector>

‎app/src/main/res/drawable-hdpi/ic_launcher_background.png

-861 Bytes
Binary file not shown.

‎app/src/main/res/drawable-hdpi/ic_launcher_foreground.png

-15.1 KB
Binary file not shown.

‎app/src/main/res/drawable-mdpi/ic_launcher_background.png

-468 Bytes
Binary file not shown.

‎app/src/main/res/drawable-mdpi/ic_launcher_foreground.png

-7.62 KB
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/ic_launcher_background.png

-1.29 KB
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png

-24.7 KB
Binary file not shown.

‎app/src/main/res/drawable-xxhdpi/ic_launcher_background.png

-2.52 KB
Binary file not shown.

‎app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png

-49.9 KB
Binary file not shown.

‎app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png

-4.14 KB
Binary file not shown.

‎app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png

-84.1 KB
Binary file not shown.

‎app/src/main/res/values/strings_donottranslate.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33
<string name="app_name" context="Name of the app" translatable="false">MEGA</string>
44
<string name="pdf_app_name" context="PDF viewer app name" translatable="false">MEGA PDF Viewer</string>
5-
<string name="app_version" context="Version number of the app" translatable="false">3.6.3 (244)</string>
5+
<string name="app_version" context="Version number of the app" translatable="false">3.6.3 (245)</string>
66
<string name="sdk_version" context="SDK version" translatable="false">b668402</string>
77
<string name="karere_version" context="MEGAchat SDK version" translatable="false">ea276c4</string>
88
<string name="prolite_account" context="PRO Lite account" translatable="false">Lite</string>

0 commit comments

Comments
 (0)