chore: Dismiss RoleInviteFragment after invitation is sent (#1721)

fossasia · Jun 15, 2019 · 63fce1f · 63fce1f
1 parent 43f025b
commit 63fce1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/src/main/java/com/eventyay/organizer/core/role/invite/RoleInviteFragment.java b/app/src/main/java/com/eventyay/organizer/core/role/invite/RoleInviteFragment.java
@@ -66,6 +66,7 @@ public void onStart() {
         roleInviteViewModel.getProgress().observe(this, this::showProgress);
         roleInviteViewModel.getSuccess().observe(this, this::onSuccess);
         roleInviteViewModel.getError().observe(this, this::showError);
+        roleInviteViewModel.getDismiss().observe(this, (dismiss) -> dismiss());
         binding.setRoleInvite(roleInviteViewModel.getRoleInvite());
         setUpSpinner();
     }
@@ -96,4 +97,8 @@ public void onSuccess(String message) {
     public void showProgress(boolean show) {
         showView(binding.progressBar, show);
     }
+
+    public void dismiss() {
+        getFragmentManager().popBackStack();
+    }
 }
diff --git a/app/src/main/java/com/eventyay/organizer/core/role/invite/RoleInviteViewModel.java b/app/src/main/java/com/eventyay/organizer/core/role/invite/RoleInviteViewModel.java
@@ -25,6 +25,7 @@ public class RoleInviteViewModel extends ViewModel {
     private final SingleEventLiveData<Boolean> progress = new SingleEventLiveData<>();
     private final SingleEventLiveData<String> error = new SingleEventLiveData<>();
     private final SingleEventLiveData<String> success = new SingleEventLiveData<>();
+    private final SingleEventLiveData<Void> dismiss = new SingleEventLiveData<>();
 
     @Inject
     public RoleInviteViewModel(RoleRepository roleRepository) {
@@ -47,6 +48,10 @@ public LiveData<String> getError() {
         return error;
     }
 
+    public LiveData<Void> getDismiss() {
+        return dismiss;
+    }
+
     public void createRoleInvite(long roleId) {
 
         long eventId = ContextManager.getSelectedEvent().getId();
@@ -63,6 +68,7 @@ public void createRoleInvite(long roleId) {
                 .doFinally(() -> progress.setValue(false))
                 .subscribe(sentRoleInvite -> {
                     success.setValue("Role Invite Sent");
+                    dismiss.call();
                 }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString())));
     }
 }