From d4068c632e4723e2528859a07e00f972d1380e1e Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 17 Oct 2017 21:29:22 +0200
Subject: [PATCH] hide party invitation view correctly

---
 .../habitica/data/implementation/SocialRepositoryImpl.java  | 6 ++++--
 .../ui/fragments/social/GroupInformationFragment.java       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
index 21f31eb38..9ab94fcf2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
@@ -134,8 +134,10 @@ public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalReposito
     public Observable<Group> joinGroup(String id) {
         return apiClient.joinGroup(id)
                 .doOnNext(group -> {
-                    group.isMember = true;
-                    localRepository.save(group);
+                    if (group != null) {
+                        group.isMember = true;
+                        localRepository.save(group);
+                    }
                 });
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 8c77c6963..e660a21d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -102,10 +102,12 @@ public class GroupInformationFragment extends BaseFragment {
         return view;
     }
 
-    private void setUser(User user) {
+    private void setUser(@Nullable User user) {
         viewBinding.setUser(user);
-        if (user.getInvitations() != null) {
+        if (group == null && user != null && user.getInvitations() != null && user.getInvitations().getParty().getId() != null) {
             viewBinding.setInvitation(user.getInvitations().getParty());
+        } else {
+            viewBinding.setInvitation(null);
         }
     }