From f4bdd201a3646da22c9930bcc3bb5404d8e2a3e0 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 15 Feb 2019 16:22:42 -0200 Subject: [PATCH] [android] fix bug where onboarding is shown again when activity resumes --- .../briar/android/conversation/ConversationViewModel.java | 4 ++++ .../briarproject/briar/android/view/TextSendController.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java index c9b3a1cd7..d35c1efcf 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java @@ -229,11 +229,15 @@ public class ConversationViewModel extends AndroidViewModel { } } + @UiThread void onImageOnboardingSeen() { + showImageOnboarding.setValue(false); onOnboardingSeen(SHOW_ONBOARDING_IMAGE); } + @UiThread void onIntroductionOnboardingSeen() { + showIntroductionOnboarding.setValue(false); onOnboardingSeen(SHOW_ONBOARDING_INTRODUCTION); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java index 68edf4a12..f0a864afe 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java @@ -67,7 +67,7 @@ public class TextSendController implements TextInputListener { LENGTH_SHORT).show(); return false; } - return ready && (canSendEmptyText() || !textInput.isEmpty()); + return ready && (canSendEmptyText() || !textIsEmpty); } protected boolean canSendEmptyText() {