Skip to content

Commit 0c97d86

Browse files
committed
Hotfix for v3.6.1 - Avoid possible NullPointerException
Avoid possible NullPointerException setting toolbar subtitle at `FileExplorerActivityLollipop`
1 parent 9b92ebd commit 0c97d86

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
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 234
12-
versionName "3.6.1 (234)"
11+
versionCode 238
12+
versionName "3.6.1 (238)"
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="234"
6-
android:versionName="3.6.1 (234)">
5+
android:versionCode="238"
6+
android:versionName="3.6.1 (238)">
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
@@ -98,7 +98,7 @@
9898
public class MegaApplication extends MultiDexApplication implements MegaGlobalListenerInterface, MegaChatRequestListenerInterface, MegaChatNotificationListenerInterface, MegaChatCallListenerInterface, NetworkStateReceiver.NetworkStateReceiverListener, MegaChatListenerInterface {
9999
final String TAG = "MegaApplication";
100100

101-
static final public String USER_AGENT = "MEGAAndroid/3.6.1_234";
101+
static final public String USER_AGENT = "MEGAAndroid/3.6.1_238";
102102

103103
DatabaseHandler dbH;
104104
MegaApiAndroid megaApi;

app/src/main/java/mega/privacy/android/app/lollipop/FileExplorerActivityLollipop.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,9 @@ public void onContactRequestsUpdate(MegaApiJava api,
26002600
}
26012601

26022602
public void setToolbarSubtitle(String s) {
2603-
aB.setSubtitle(s);
2603+
if (aB != null) {
2604+
aB.setSubtitle(s);
2605+
}
26042606
}
26052607

26062608
@Override

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.1 (234)</string>
5+
<string name="app_version" context="Version number of the app" translatable="false">3.6.1 (238)</string>
66
<string name="sdk_version" context="SDK version" translatable="false">a69204a</string>
77
<string name="karere_version" context="MEGAchat SDK version" translatable="false">9938c91</string>
88
<string name="prolite_account" context="PRO Lite account" translatable="false">Lite</string>

0 commit comments

Comments
 (0)