From 89941db572bf77ce079c2b34f7c6659e001457d8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 23 Aug 2019 10:52:14 +0200 Subject: [PATCH] Fixed bad behavior on toolbar back button in the assistant menu on first launch --- .../org/linphone/assistant/MenuAssistantActivity.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/org/linphone/assistant/MenuAssistantActivity.java b/app/src/main/java/org/linphone/assistant/MenuAssistantActivity.java index 0ce13e30d..29951e85b 100644 --- a/app/src/main/java/org/linphone/assistant/MenuAssistantActivity.java +++ b/app/src/main/java/org/linphone/assistant/MenuAssistantActivity.java @@ -130,10 +130,20 @@ public class MenuAssistantActivity extends AssistantActivity { @Override protected void onResume() { super.onResume(); + if (getResources() .getBoolean(R.bool.forbid_to_leave_assistant_before_account_configuration)) { mBack.setEnabled(false); } + + mBack.setOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View v) { + LinphonePreferences.instance().firstLaunchSuccessful(); + goToLinphoneActivity(); + } + }); } @Override