From 8e5343f63fc42a046f0d8ad09b3df200fc126b2f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 27 Feb 2017 09:39:21 +0100
Subject: [PATCH] fix potential crash

---
 Habitica/AndroidManifest.xml                    |  2 +-
 Habitica/res/values-pt-rBR/strings.profile.xml  |  2 +-
 .../ui/activities/TaskFormActivity.java         | 17 +++++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 704d373d9..9927faccd 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="158"
+    android:versionCode="159"
     android:versionName="0.0.37.2"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/values-pt-rBR/strings.profile.xml b/Habitica/res/values-pt-rBR/strings.profile.xml
index 132a1db70..6704db386 100644
--- a/Habitica/res/values-pt-rBR/strings.profile.xml
+++ b/Habitica/res/values-pt-rBR/strings.profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="profile_pets_and_mounts">Mascotes & Montarias</string>
+    <string name="profile_pets_and_mounts">Mascotes &amp; Montarias</string>
     <string name="profile_pets_found">Mascotes Encontrados</string>
     <string name="profile_mounts_tamed">Montarias Domesticadas</string>
     <string name="profile_loading_data">Carregando dados de membro</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 166c71564..5057b4d88 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -421,16 +421,6 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                         throwable -> {
                         }
                 );
-
-        if (task.isGroupTask()) {
-            new AlertDialog.Builder(this)
-                    .setTitle(R.string.group_tasks_edit_title)
-                    .setMessage(R.string.group_tasks_edit_description)
-                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                        finish();
-                    })
-                    .show();
-        }
     }
 
 
@@ -729,6 +719,13 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             }
         }
 
+        if (task.isGroupTask()) {
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.group_tasks_edit_title)
+                    .setMessage(R.string.group_tasks_edit_description)
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> finish())
+                    .show();
+        }
     }
 
     private void fillTagCheckboxes() {