From 0c97d863dc1f7f87c83fca5ae887e2277da12e31 Mon Sep 17 00:00:00 2001
From: Javier Gomez <jg@mega.co.nz>
Date: Tue, 7 May 2019 11:10:21 +0200
Subject: [PATCH] Hotfix for v3.6.1 - Avoid possible NullPointerException

Avoid possible NullPointerException setting toolbar subtitle at
`FileExplorerActivityLollipop`
---
 app/build.gradle                                              | 4 ++--
 app/src/main/AndroidManifest.xml                              | 4 ++--
 .../main/java/mega/privacy/android/app/MegaApplication.java   | 2 +-
 .../android/app/lollipop/FileExplorerActivityLollipop.java    | 4 +++-
 app/src/main/res/values/strings_donottranslate.xml            | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d899cbc5da..4aa84d24cdc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "mega.privacy.android.app"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 234
-        versionName "3.6.1 (234)"
+        versionCode 238
+        versionName "3.6.1 (238)"
         multiDexEnabled true
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4870543d1a7..c54ed968755 100644
--- 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="234"
-    android:versionName="3.6.1 (234)">
+    android:versionCode="238"
+    android:versionName="3.6.1 (238)">
 
     <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
index 48a43a7723f..bc3edc318a9 100644
--- a/app/src/main/java/mega/privacy/android/app/MegaApplication.java
+++ b/app/src/main/java/mega/privacy/android/app/MegaApplication.java
@@ -98,7 +98,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.1_234";
+	static final public String USER_AGENT = "MEGAAndroid/3.6.1_238";
 
 	DatabaseHandler dbH;
 	MegaApiAndroid megaApi;
diff --git a/app/src/main/java/mega/privacy/android/app/lollipop/FileExplorerActivityLollipop.java b/app/src/main/java/mega/privacy/android/app/lollipop/FileExplorerActivityLollipop.java
index 8d9535b4872..fa4f5c7e2a2 100644
--- a/app/src/main/java/mega/privacy/android/app/lollipop/FileExplorerActivityLollipop.java
+++ b/app/src/main/java/mega/privacy/android/app/lollipop/FileExplorerActivityLollipop.java
@@ -2600,7 +2600,9 @@ public void onContactRequestsUpdate(MegaApiJava api,
 	}
 
 	public void setToolbarSubtitle(String s) {
-		aB.setSubtitle(s);
+	    if (aB != null) {
+            aB.setSubtitle(s);
+        }
 	}
 	
 	@Override
diff --git a/app/src/main/res/values/strings_donottranslate.xml b/app/src/main/res/values/strings_donottranslate.xml
index 45a0652f6e5..572505a4035 100644
--- 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.1 (234)</string>
+    <string name="app_version" context="Version number of the app" translatable="false">3.6.1 (238)</string>
     <string name="sdk_version" context="SDK version" translatable="false">a69204a</string>
     <string name="karere_version" context="MEGAchat SDK version" translatable="false">9938c91</string>
     <string name="prolite_account" context="PRO Lite account" translatable="false">Lite</string>