From ed1d4409da60193ea29eb02b7ebd1bba62a153b9 Mon Sep 17 00:00:00 2001 From: Amartya Mondal Date: Wed, 15 May 2019 02:08:01 +0530 Subject: [PATCH 1/5] Fixed malfunction of settings fragment --- .../susi/ai/skills/settings/ChatSettingsFragment.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt index 0de9da8d2a..625e314aa4 100644 --- a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt +++ b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt @@ -189,7 +189,7 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView { } loginLogout.setOnPreferenceClickListener { - if (!settingsPresenter.getAnonymity()) { + if (!settingsPresenter.getAnonymity() && utilModel.isLoggedIn()) { val builder = AlertDialog.Builder(requireContext()) builder.setMessage(R.string.logout_confirmation).setCancelable(false).setPositiveButton(R.string.action_log_out) { _, _ -> settingsPresenter.loginLogout() @@ -200,6 +200,9 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView { alert.show() } else { settingsPresenter.loginLogout() + val intent = Intent(context, LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) } true } @@ -216,6 +219,9 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView { displayEmail.setOnPreferenceClickListener { settingsPresenter.loginLogout() + val intent = Intent(context, LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) true } From 299d41a90d413c8f333fd1d4e270e533e5fe16b4 Mon Sep 17 00:00:00 2001 From: Amartya Mondal Date: Fri, 17 May 2019 20:35:20 +0530 Subject: [PATCH 2/5] Bug fix --- .../main/java/org/fossasia/susi/ai/login/LoginActivity.kt | 5 +++++ .../fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt index b4cfc50154..f3218c40ff 100644 --- a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt +++ b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt @@ -228,4 +228,9 @@ class LoginActivity : AppCompatActivity(), ILoginView { loginPresenter.requestPassword(email, url, isPersonalServerChecked) } } + + override fun onBackPressed() { + super.onBackPressed() + startActivity(Intent(this, ChatActivity::class.java)) + } } diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt index 625e314aa4..e94b2add44 100644 --- a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt +++ b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt @@ -201,7 +201,6 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView { } else { settingsPresenter.loginLogout() val intent = Intent(context, LoginActivity::class.java) - intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK startActivity(intent) } true @@ -220,7 +219,6 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView { displayEmail.setOnPreferenceClickListener { settingsPresenter.loginLogout() val intent = Intent(context, LoginActivity::class.java) - intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK startActivity(intent) true } From 2547940c5630cb32a62e5da9536409747e4d3bbb Mon Sep 17 00:00:00 2001 From: Amartya Mondal Date: Mon, 20 May 2019 19:36:26 +0530 Subject: [PATCH 3/5] Added flags --- app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt index f3218c40ff..3c34a157e6 100644 --- a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt +++ b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt @@ -231,6 +231,8 @@ class LoginActivity : AppCompatActivity(), ILoginView { override fun onBackPressed() { super.onBackPressed() - startActivity(Intent(this, ChatActivity::class.java)) + val intent = Intent(this, ChatActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) } } From c8ea62fbe0b1f336bbd3ee7996d71a550610e87b Mon Sep 17 00:00:00 2001 From: Amartya Mondal Date: Sun, 2 Jun 2019 23:37:49 +0530 Subject: [PATCH 4/5] merge conflict resolved --- .../susi/ai/skills/settings/ChatSettingsFragment.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt index 864aaa77b6..f359f0f6a4 100644 --- a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt +++ b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt @@ -203,13 +203,9 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView { alert.setTitle(getString(R.string.logout)) alert.show() } else { - <<<<<<< HEAD - settingsPresenter.loginLogout() + loginLogoutModulePresenter.logout() val intent = Intent(context, LoginActivity::class.java) startActivity(intent) - ====== = - loginLogoutModulePresenter.logout() - >>>>>>> a9e6bb6489b37229750071b8e2b272154ddf0899 } true } From e1135017e506627ea20d7f2945cb3bdd51355516 Mon Sep 17 00:00:00 2001 From: Amartya Mondal Date: Thu, 13 Jun 2019 19:42:55 +0530 Subject: [PATCH 5/5] Remove extra lines --- app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt index 9aec9fde9c..0b49c44493 100644 --- a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt +++ b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt @@ -232,6 +232,5 @@ class LoginActivity : AppCompatActivity(), ILoginView { override fun onBackPressed() { super.onBackPressed() loginPresenter.skipLogin() - super.onBackPressed() } }