From 9cae4bea037f60d756f0c21b08428d26dadaeeab Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 25 Feb 2020 10:50:04 +0100
Subject: [PATCH] new update

---
 Habitica/build.gradle                                       | 6 +++---
 .../habitrpg/android/habitica/ui/fragments/AboutFragment.kt | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 45fd60a5a..41ebc3323 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -117,7 +117,7 @@ dependencies {
     //Push Notifications
     implementation 'com.google.firebase:firebase-core:17.2.2'
     implementation 'com.google.firebase:firebase-messaging:20.1.0'
-    implementation 'com.google.firebase:firebase-config:19.1.0'
+    implementation 'com.google.firebase:firebase-config:19.1.1'
     implementation 'com.google.firebase:firebase-perf:19.0.5'
     implementation 'com.google.android.gms:play-services-auth:17.0.0'
     implementation 'io.realm:android-adapters:3.1.0'
@@ -125,7 +125,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.nex3z:flow-layout:1.2.2'
 
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
     implementation 'androidx.navigation:navigation-fragment-ktx:2.2.1'
@@ -153,7 +153,7 @@ android {
         multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2380
+        versionCode 2384
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
index 1e6f540b8..339e4cff8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
@@ -159,13 +159,15 @@ class AboutFragment : BaseMainFragment() {
 
         bodyOfEmail += " \nDetails:\n"
 
-        ShareCompat.IntentBuilder.from(activity)
+        activity?.let {
+            ShareCompat.IntentBuilder.from(it)
                 .setType("message/rfc822")
                 .addEmailTo(appConfigManager.supportEmail())
                 .setSubject(subject)
                 .setText(bodyOfEmail)
                 .setChooserTitle("Send email...")
                 .startChooser()
+        }
     }
 
     private fun doTheThing() {