fix: Fixed malfunction of settings fragment #2203

atm1504 · 2019-05-14T20:53:18Z

Fixes #2055

Changes: [Add here what changes were made in this issue and if possible provide links.]
Fixed it by checking whether the user is logged in or not. Initially, it used only anonymity as a parameter to check

Screenshots for the change:

liveHarshit · 2019-05-15T06:14:39Z

app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt

@@ -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


Not a good idea for FLAG_ACTIVITY_CLEAR_TOP. What if we go back after intent, it should redirect to chat screen. Right?

It will redirect to the settings fragment only. And I think it should redirect there only, as we have opened the login screen from there itself

It will redirect to the settings fragment only.

Your intent is redirecting to Login activity and clear all activities in the back stack. Right?

Yah. Why keep the back stack filled once we are moving to the login page? Because after login the user will be redirected to the chat page. So, it's better to free up the stack

IMO, not better user experience. Back button should redirect to chat screen instead of closing the application.

@liveHarshit u want to say that if we press the back button at the login screen, it should redirect to the chat screen. R8?

liveHarshit · 2019-05-19T04:04:36Z

app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt

+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        startActivity(Intent(this, ChatActivity::class.java))


Okay, add a flag to clear back stack here.

liveHarshit

You can remove duplication by creating a common method in ChatSettingsFragment

ci-reporter · 2019-05-22T15:19:05Z

The build is failing

✨ Good work on this PR so far! ✨ Unfortunately, the Circle CI build is failing as of 08fe185. Here's the output:

`Run Tests`

> Task :app:preBuild UP-TO-DATE

I'm sure you can fix it! If you need help, don't hesitate to ask a maintainer of the project!

Failed build for 6f4906b

`Run Tests`

> Task :app:preBuild UP-TO-DATE

Failed build for 7f740ee

`lint check`

> Task :app:preBuild UP-TO-DATE

This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

ci-reporter · 2019-05-22T15:19:08Z

The build is failing

✨ Good work on this PR so far! ✨ Unfortunately, the Circle CI build is failing as of 7f740ee. Here's the output:

`lint check`

> Task :app:preBuild UP-TO-DATE

I'm sure you can fix it! If you need help, don't hesitate to ask a maintainer of the project!

This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

mariobehling · 2019-05-25T22:31:55Z

Please resolve conflicts.

liveHarshit · 2019-06-02T06:41:36Z

You can remove duplication by creating a common method in ChatSettingsFragment

@atm1504 Please update pending PRs and resolve conflicts. And request a review from mentors.

atm1504 · 2019-06-02T06:42:58Z

You can remove duplication by creating a common method in ChatSettingsFragment

@atm1504 Please update pending PRs and resolve conflicts. And request a review from mentors.

Yah sure

…into atm_settings_malfunc

atm1504 · 2019-06-06T15:04:54Z

@iamareebjamal @arundhati24 @batbrain7 please review it.

iamareebjamal · 2019-06-06T16:55:04Z

app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt

+        super.onBackPressed()
+        val intent = Intent(this, ChatActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
+        startActivity(intent)


…into atm_settings_malfunc

atm1504 · 2019-06-06T17:03:45Z

@iamareebjamal please review now. I have corrected it.

atm1504 · 2019-06-08T09:17:13Z

@iamareebjamal @arundhati24 @batbrain7 please review it.

atm1504 · 2019-06-12T19:09:32Z

@iamareebjamal @arundhati24 please review it.

iamareebjamal · 2019-06-13T06:05:32Z

app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt

@@ -230,6 +230,7 @@ class LoginActivity : AppCompatActivity(), ILoginView {
    }

    override fun onBackPressed() {
+        super.onBackPressed()
        loginPresenter.skipLogin()
        super.onBackPressed()


THis happened by mistake while resolving the merge conflict. Have removed it in the update.

Fixed malfunction of settings fragment

ed1d440

auto-label bot added the fix label May 14, 2019

liveHarshit reviewed May 15, 2019

View reviewed changes

atm1504 added 5 commits May 16, 2019 18:46

Merge branch 'development' into atm_settings_malfunc

f48c482

Merge branch 'development' into atm_settings_malfunc

faa8b3e

Merge branch 'development' into atm_settings_malfunc

a6f3e22

Bug fix

299d41a

Merge branch 'development' into atm_settings_malfunc

5af3dc3

liveHarshit reviewed May 19, 2019

View reviewed changes

atm1504 added 2 commits May 20, 2019 19:32

Merge branch 'development' into atm_settings_malfunc

f0d9ed1

Added flags

2547940

liveHarshit approved these changes May 20, 2019

View reviewed changes

Merge branch 'development' into atm_settings_malfunc

7f740ee

atm1504 added 2 commits June 2, 2019 23:36

Merge branch 'development' of https://github.com/fossasia/susi_android …

24339e2

…into atm_settings_malfunc

merge conflict resolved

c8ea62f

ShridharGoel approved these changes Jun 2, 2019

View reviewed changes

Merge branch 'development' into atm_settings_malfunc

cac05af

iamareebjamal reviewed Jun 6, 2019

View reviewed changes

Merge branch 'development' of https://github.com/fossasia/susi_android …

b8d324e

…into atm_settings_malfunc

mariobehling and others added 3 commits June 8, 2019 15:28

Merge branch 'development' into atm_settings_malfunc

6f4906b

Merge branch 'development' into atm_settings_malfunc

74f0ee9

Merge branch 'development' into atm_settings_malfunc

08fe185

Merge branch 'development' into atm_settings_malfunc

962fda3

iamareebjamal reviewed Jun 13, 2019

View reviewed changes

Remove extra lines

e113501

iamareebjamal approved these changes Jun 13, 2019

View reviewed changes

iamareebjamal merged commit e71bdc7 into fossasia:development Jun 13, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Fixed malfunction of settings fragment #2203

fix: Fixed malfunction of settings fragment #2203

atm1504 commented May 14, 2019

liveHarshit May 15, 2019

atm1504 May 15, 2019

liveHarshit May 15, 2019

atm1504 May 16, 2019

liveHarshit May 17, 2019

atm1504 May 17, 2019

liveHarshit May 19, 2019

liveHarshit May 19, 2019

liveHarshit left a comment

ci-reporter bot commented May 22, 2019 •

edited

Loading

`Run Tests`

`lint check`

ci-reporter bot commented May 22, 2019

mariobehling commented May 25, 2019

liveHarshit commented Jun 2, 2019

atm1504 commented Jun 2, 2019

atm1504 commented Jun 6, 2019

iamareebjamal Jun 6, 2019

atm1504 commented Jun 6, 2019

atm1504 commented Jun 8, 2019

atm1504 commented Jun 12, 2019

iamareebjamal Jun 13, 2019

atm1504 Jun 13, 2019

fix: Fixed malfunction of settings fragment #2203

fix: Fixed malfunction of settings fragment #2203

Conversation

atm1504 commented May 14, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liveHarshit left a comment

Choose a reason for hiding this comment

ci-reporter bot commented May 22, 2019 • edited Loading

The build is failing

Run Tests

Run Tests

lint check

This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

ci-reporter bot commented May 22, 2019

The build is failing

lint check

This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

mariobehling commented May 25, 2019

liveHarshit commented Jun 2, 2019

atm1504 commented Jun 2, 2019

atm1504 commented Jun 6, 2019

Choose a reason for hiding this comment

atm1504 commented Jun 6, 2019

atm1504 commented Jun 8, 2019

atm1504 commented Jun 12, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ci-reporter bot commented May 22, 2019 •

edited

Loading

`Run Tests`

`Run Tests`

`lint check`

`lint check`