Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fixed malfunction of settings fragment #2203

Merged
merged 18 commits into from
Jun 13, 2019
Merged

fix: Fixed malfunction of settings fragment #2203

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ed1d440
Fixed malfunction of settings fragment
atm1504 May 14, 2019
f48c482
Merge branch 'development' into atm_settings_malfunc
atm1504 May 16, 2019
faa8b3e
Merge branch 'development' into atm_settings_malfunc
atm1504 May 16, 2019
a6f3e22
Merge branch 'development' into atm_settings_malfunc
atm1504 May 17, 2019
299d41a
Bug fix
atm1504 May 17, 2019
5af3dc3
Merge branch 'development' into atm_settings_malfunc
atm1504 May 17, 2019
f0d9ed1
Merge branch 'development' into atm_settings_malfunc
atm1504 May 20, 2019
2547940
Added flags
atm1504 May 20, 2019
7f740ee
Merge branch 'development' into atm_settings_malfunc
atm1504 May 22, 2019
24339e2
Merge branch 'development' of https://github.com/fossasia/susi_androi…
atm1504 Jun 2, 2019
c8ea62f
merge conflict resolved
atm1504 Jun 2, 2019
cac05af
Merge branch 'development' into atm_settings_malfunc
atm1504 Jun 6, 2019
b8d324e
Merge branch 'development' of https://github.com/fossasia/susi_androi…
atm1504 Jun 6, 2019
6f4906b
Merge branch 'development' into atm_settings_malfunc
mariobehling Jun 8, 2019
74f0ee9
Merge branch 'development' into atm_settings_malfunc
atm1504 Jun 9, 2019
08fe185
Merge branch 'development' into atm_settings_malfunc
atm1504 Jun 12, 2019
962fda3
Merge branch 'development' into atm_settings_malfunc
atm1504 Jun 12, 2019
e113501
Remove extra lines
atm1504 Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,11 @@ class LoginActivity : AppCompatActivity(), ILoginView {
loginPresenter.requestPassword(email, url, isPersonalServerChecked)
}
}

override fun onBackPressed() {
super.onBackPressed()
val intent = Intent(this, ChatActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
startActivity(intent)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong

}
}
5 changes: 2 additions & 3 deletions app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {
} else {
loginLogoutModulePresenter.logout()
val intent = Intent(requireContext(), LoginActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
startActivity(intent)
}
true
Expand All @@ -223,8 +222,7 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {

displayEmail.setOnPreferenceClickListener {
loginLogoutModulePresenter.logout()
val intent = Intent(requireContext(), LoginActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
val intent = Intent(context, LoginActivity::class.java)
startActivity(intent)
true
}
Expand Down Expand Up @@ -328,6 +326,7 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {
config.locale = locale
this.resources.updateConfiguration(config, this.resources.displayMetrics)
}

private fun showAlert() {
val builder = AlertDialog.Builder(requireContext())
val promptsView = activity?.layoutInflater?.inflate(R.layout.alert_change_server, null)
Expand Down