fix: Correct the code to move to login page (#2048)

atm1504 · mariobehling · commit feb2054f5ca0 · 2019-05-26T00:24:49.000+02:00
* Correct the code to move to login page

* Applied correct format of code

* Spotless check

* LoginLogout Module implemented in SkillsDetails Fragment

Applied loginLogout presenter in signup activity

Refactored Settings and Skills Activity

* Spotless check

* Activity changed to context

* Context type changed

* Var changed to val

* Renamed function

* Suggested changes

* CIRCLECI check applied

* Signup changes reverted

* Circle ci applied
diff --git a/app/src/main/java/org/fossasia/susi/ai/login/LoginLogoutModulePresenter.kt b/app/src/main/java/org/fossasia/susi/ai/login/LoginLogoutModulePresenter.kt
@@ -0,0 +1,23 @@
+package org.fossasia.susi.ai.login
+
+import android.content.Context
+import org.fossasia.susi.ai.data.UtilModel
+import org.fossasia.susi.ai.data.db.DatabaseRepository
+import org.fossasia.susi.ai.data.db.contract.IDatabaseRepository
+import org.fossasia.susi.ai.login.contract.ILoginLogoutModulePresenter
+import org.fossasia.susi.ai.skills.settings.contract.ISettingsView
+
+class LoginLogoutModulePresenter(context: Context) : ILoginLogoutModulePresenter {
+
+    private val utilModel: UtilModel = UtilModel(context)
+    private val databaseRepository: IDatabaseRepository = DatabaseRepository()
+    private val settingView: ISettingsView? = null
+
+    override fun logout() {
+        utilModel.clearToken()
+        utilModel.clearPrefs()
+        utilModel.saveAnonymity(false)
+        databaseRepository.deleteAllMessages()
+        settingView?.startLoginActivity()
+    }
+}
diff --git a/app/src/main/java/org/fossasia/susi/ai/login/contract/ILoginLogoutModulePresenter.kt b/app/src/main/java/org/fossasia/susi/ai/login/contract/ILoginLogoutModulePresenter.kt
@@ -0,0 +1,5 @@
+package org.fossasia.susi.ai.login.contract
+
+interface ILoginLogoutModulePresenter {
+    fun logout()
+}
diff --git a/app/src/main/java/org/fossasia/susi/ai/signup/SignUpPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/signup/SignUpPresenter.kt
@@ -144,7 +144,6 @@ class SignUpPresenter(signUpActivity: SignUpActivity) : ISignUpPresenter, ISignU
         databaseRepository.deleteAllMessages()
         settingView?.startLoginActivity()
     }
-
     override fun requestPassword(email: String, url: String, isPersonalServerChecked: Boolean) {
         if (email.isEmpty()) {
             signUpView?.invalidCredentials(true, Constant.EMAIL)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt b/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
@@ -17,6 +17,8 @@ import org.fossasia.susi.ai.chat.ChatActivity
 import org.fossasia.susi.ai.helper.Constant
 import org.fossasia.susi.ai.helper.Utils.hideSoftKeyboard
 import org.fossasia.susi.ai.login.LoginActivity
+import org.fossasia.susi.ai.login.LoginLogoutModulePresenter
+import org.fossasia.susi.ai.login.contract.ILoginLogoutModulePresenter
 import org.fossasia.susi.ai.rest.responses.susi.SkillData
 import org.fossasia.susi.ai.signup.SignUpActivity
 import org.fossasia.susi.ai.skills.groupwiseskills.GroupWiseSkillsFragment
@@ -50,13 +52,15 @@ class SkillsActivity : AppCompatActivity(), SkillFragmentCallback {
     private var text: String = ""
     private var group: String = ""
     private lateinit var settingsPresenter: ISettingsPresenter
+    private lateinit var loginLogoutModulePresenter: ILoginLogoutModulePresenter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         overridePendingTransition(R.anim.trans_left_in, R.anim.trans_left_out)
         setContentView(R.layout.activity_skills)
 
         settingsPresenter = SettingsPresenter(this)
+        loginLogoutModulePresenter = LoginLogoutModulePresenter(this)
         val skillFragment = SkillListingFragment()
         val privacyFragment = PrivacyFragment()
         val bundle = intent.extras
@@ -145,7 +149,7 @@ class SkillsActivity : AppCompatActivity(), SkillFragmentCallback {
                 if (!settingsPresenter.getAnonymity()) {
                     val builder = AlertDialog.Builder(this)
                     builder.setMessage(R.string.logout_confirmation).setCancelable(false).setPositiveButton(R.string.action_log_out) { _, _ ->
-                        settingsPresenter.loginLogout()
+                        loginLogoutModulePresenter.logout()
                         val intent = Intent(this, LoginActivity::class.java)
                         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
                         startActivity(intent)
@@ -155,7 +159,7 @@ class SkillsActivity : AppCompatActivity(), SkillFragmentCallback {
                     alert.setTitle(getString(R.string.logout))
                     alert.show()
                 } else {
-                    settingsPresenter.loginLogout()
+                    loginLogoutModulePresenter.logout()
                     val intent = Intent(this, LoginActivity::class.java)
                     intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
                     startActivity(intent)
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
@@ -32,6 +32,8 @@ import org.fossasia.susi.ai.skills.settings.contract.ISettingsView
 import timber.log.Timber
 import java.util.Locale
 import android.content.ActivityNotFoundException
+import org.fossasia.susi.ai.login.LoginLogoutModulePresenter
+import org.fossasia.susi.ai.login.contract.ILoginLogoutModulePresenter
 import org.fossasia.susi.ai.skills.help.HelpFragment
 import org.fossasia.susi.ai.skills.privacy.PrivacyFragment
 
@@ -47,6 +49,7 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {
     private val TAG_HELP_FRAGMENT = "HelpFragment"
     private val TAG_PRIVACY_FRAGMENT = "PrivacyFragment"
     private lateinit var settingsPresenter: ISettingsPresenter
+    private lateinit var loginLogoutModulePresenter: ILoginLogoutModulePresenter
 
     private lateinit var rate: Preference
     lateinit var server: Preference
@@ -84,6 +87,7 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {
         if (thisActivity is SkillsActivity) thisActivity.title = getString(R.string.action_settings)
         settingsPresenter = SettingsPresenter(activity as SkillsActivity)
         settingsPresenter.onAttach(this)
+        loginLogoutModulePresenter = LoginLogoutModulePresenter(requireContext())
 
         setHasOptionsMenu(true)
 
@@ -192,14 +196,14 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {
             if (!settingsPresenter.getAnonymity()) {
                 val builder = AlertDialog.Builder(requireContext())
                 builder.setMessage(R.string.logout_confirmation).setCancelable(false).setPositiveButton(R.string.action_log_out) { _, _ ->
-                    settingsPresenter.loginLogout()
+                    loginLogoutModulePresenter.logout()
                 }.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.cancel() }
 
                 val alert = builder.create()
                 alert.setTitle(getString(R.string.logout))
                 alert.show()
             } else {
-                settingsPresenter.loginLogout()
+                loginLogoutModulePresenter.logout()
             }
             true
         }
@@ -215,7 +219,7 @@ class ChatSettingsFragment : PreferenceFragmentCompat(), ISettingsView {
         }
 
         displayEmail.setOnPreferenceClickListener {
-            settingsPresenter.loginLogout()
+            loginLogoutModulePresenter.logout()
             true
         }
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/SettingsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/SettingsPresenter.kt
@@ -59,14 +59,6 @@ class SettingsPresenter(skillsActivity: SkillsActivity) :
         }
     }
 
-    override fun loginLogout() {
-        utilModel.clearToken()
-        utilModel.clearPrefs()
-        utilModel.saveAnonymity(false)
-        databaseRepository.deleteAllMessages()
-        settingView?.startLoginActivity()
-    }
-
     override fun resetPassword(password: String, newPassword: String, conPassword: String) {
         if (password.isEmpty()) {
             settingView?.invalidCredentials(true, Constant.PASSWORD)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/contract/ISettingsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/contract/ISettingsPresenter.kt
@@ -16,8 +16,6 @@ interface ISettingsPresenter {
 
     fun onDetach()
 
-    fun loginLogout()
-
     fun resetPassword(password: String, newPassword: String, conPassword: String)
 
     fun checkForPassword(password: String, what: String)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt
@@ -34,6 +34,8 @@ import org.fossasia.susi.ai.dataclasses.ReportSkillQuery
 import org.fossasia.susi.ai.helper.PrefManager
 import org.fossasia.susi.ai.helper.Utils
 import org.fossasia.susi.ai.login.LoginActivity
+import org.fossasia.susi.ai.login.LoginLogoutModulePresenter
+import org.fossasia.susi.ai.login.contract.ILoginLogoutModulePresenter
 import org.fossasia.susi.ai.rest.responses.susi.GetSkillFeedbackResponse
 import org.fossasia.susi.ai.rest.responses.susi.SkillData
 import org.fossasia.susi.ai.rest.responses.susi.Stars
@@ -45,6 +47,7 @@ import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsView
 class SkillDetailsFragment : Fragment(), ISkillDetailsView {
 
     private lateinit var skillDetailsPresenter: ISkillDetailsPresenter
+    private lateinit var loginLogoutModulePresenter: ILoginLogoutModulePresenter
 
     private lateinit var skillData: SkillData
     private lateinit var skillGroup: String
@@ -72,6 +75,7 @@ class SkillDetailsFragment : Fragment(), ISkillDetailsView {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         skillDetailsPresenter = SkillDetailsPresenter(this)
+        loginLogoutModulePresenter = LoginLogoutModulePresenter(requireContext())
         skillDetailsPresenter.onAttach(this)
         skillData = arguments?.getParcelable(
                 SKILL_KEY) as SkillData
@@ -499,7 +503,9 @@ class SkillDetailsFragment : Fragment(), ISkillDetailsView {
         } else {
             tvAnonymousPostFeedback.visibility = View.VISIBLE
             tvAnonymousPostFeedback.setOnClickListener {
+                loginLogoutModulePresenter.logout()
                 val intentToLogin = Intent(context, LoginActivity::class.java)
+                intentToLogin.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
                 startActivity(intentToLogin)
             }
         }
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsPresenter.kt
@@ -4,6 +4,8 @@ import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.data.contract.ISkillDetailsModel
 import org.fossasia.susi.ai.data.SkillDetailsModel
 import org.fossasia.susi.ai.data.UtilModel
+import org.fossasia.susi.ai.data.db.DatabaseRepository
+import org.fossasia.susi.ai.data.db.contract.IDatabaseRepository
 import org.fossasia.susi.ai.dataclasses.FetchFeedbackQuery
 import org.fossasia.susi.ai.dataclasses.PostFeedback
 import org.fossasia.susi.ai.dataclasses.ReportSkillQuery
@@ -13,6 +15,7 @@ import org.fossasia.susi.ai.rest.responses.susi.PostSkillFeedbackResponse
 import org.fossasia.susi.ai.rest.responses.susi.GetSkillFeedbackResponse
 import org.fossasia.susi.ai.rest.responses.susi.ReportSkillResponse
 import org.fossasia.susi.ai.rest.responses.susi.GetRatingByUserResponse
+import org.fossasia.susi.ai.skills.settings.contract.ISettingsView
 import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsPresenter
 import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsView
 import retrofit2.Response
@@ -33,6 +36,8 @@ class SkillDetailsPresenter(skillDetailsFragment: SkillDetailsFragment) : ISkill
     private var skillDetailsModel: SkillDetailsModel = SkillDetailsModel()
     private var skillDetailsView: ISkillDetailsView? = null
     private val utilModel: UtilModel = UtilModel(skillDetailsFragment.requireContext())
+    private var databaseRepository: IDatabaseRepository = DatabaseRepository()
+    private var settingView: ISettingsView? = null
 
     override fun onAttach(skillDetailsView: ISkillDetailsView) {
         this.skillDetailsView = skillDetailsView

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@ class SignUpPresenter(signUpActivity: SignUpActivity) : ISignUpPresenter, ISignU`
`144`	`144`	`databaseRepository.deleteAllMessages()`
`145`	`145`	`settingView?.startLoginActivity()`
`146`	`146`	`}`
`147`		`-`
`148`	`147`	`override fun requestPassword(email: String, url: String, isPersonalServerChecked: Boolean) {`
`149`	`148`	`if (email.isEmpty()) {`
`150`	`149`	`signUpView?.invalidCredentials(true, Constant.EMAIL)`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,6 @@ class SettingsPresenter(skillsActivity: SkillsActivity) :`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- override fun loginLogout() {`
`63`		`- utilModel.clearToken()`
`64`		`- utilModel.clearPrefs()`
`65`		`- utilModel.saveAnonymity(false)`
`66`		`- databaseRepository.deleteAllMessages()`
`67`		`- settingView?.startLoginActivity()`
`68`		`- }`
`69`		`-`
`70`	`62`	`override fun resetPassword(password: String, newPassword: String, conPassword: String) {`
`71`	`63`	`if (password.isEmpty()) {`
`72`	`64`	`settingView?.invalidCredentials(true, Constant.PASSWORD)`