Skip to content

Commit e3a1602

Browse files
committed
fix: appcrash on signup due to smart auth by removing it
Fixes: #1531 Changes: - Removes the Smart Auth features to fix app crash. These will be reimplemented later SmartAuthViewModels files have not been deleted
1 parent d4e8f8c commit e3a1602

File tree

4 files changed

+0
-47
lines changed

4 files changed

+0
-47
lines changed

app/src/main/java/org/fossasia/openevent/general/MainActivity.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.fossasia.openevent.general
22

3-
import android.content.Intent
43
import android.os.Bundle
54
import androidx.appcompat.app.AppCompatActivity
65
import androidx.navigation.NavController
@@ -11,9 +10,6 @@ import kotlinx.android.synthetic.main.activity_main.navigation
1110
import kotlinx.android.synthetic.main.activity_main.navigationAuth
1211
import kotlinx.android.synthetic.main.activity_main.mainFragmentCoordinatorLayout
1312
import org.fossasia.openevent.general.auth.EditProfileFragment
14-
import org.fossasia.openevent.general.search.RC_CREDENTIALS_READ
15-
import org.fossasia.openevent.general.search.RC_CREDENTIALS_SAVE
16-
import org.fossasia.openevent.general.search.SmartAuthViewModel
1713
import org.fossasia.openevent.general.utils.Utils.navAnimGone
1814
import org.fossasia.openevent.general.utils.Utils.navAnimVisible
1915

@@ -93,13 +89,6 @@ class MainActivity : AppCompatActivity() {
9389
fun onSuperBackPressed() {
9490
super.onBackPressed()
9591
}
96-
97-
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
98-
if (requestCode == RC_CREDENTIALS_READ || requestCode == RC_CREDENTIALS_SAVE)
99-
SmartAuthViewModel().onActivityResult(requestCode, resultCode, data, this)
100-
else
101-
super.onActivityResult(requestCode, resultCode, data)
102-
}
10392
}
10493

10594
interface ScrollToTop {

app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.fossasia.openevent.general.auth
22

33
import android.os.Bundle
44
import android.text.Editable
5-
import android.text.SpannableStringBuilder
65
import android.text.TextWatcher
76
import android.view.LayoutInflater
87
import android.view.MenuItem
@@ -27,7 +26,6 @@ import kotlinx.android.synthetic.main.fragment_login.view.loginLayout
2726
import kotlinx.android.synthetic.main.fragment_login.view.sentEmailLayout
2827
import kotlinx.android.synthetic.main.fragment_login.view.tick
2928
import org.fossasia.openevent.general.R
30-
import org.fossasia.openevent.general.search.SmartAuthViewModel
3129
import org.fossasia.openevent.general.utils.Utils
3230
import org.fossasia.openevent.general.utils.Utils.show
3331
import org.fossasia.openevent.general.utils.Utils.hideSoftKeyboard
@@ -38,7 +36,6 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
3836
class LoginFragment : Fragment() {
3937

4038
private val loginViewModel by viewModel<LoginViewModel>()
41-
private val smartAuthViewModel by viewModel<SmartAuthViewModel>()
4239
private lateinit var rootView: View
4340
private val safeArgs: LoginFragmentArgs by navArgs()
4441

@@ -54,8 +51,6 @@ class LoginFragment : Fragment() {
5451
setHasOptionsMenu(true)
5552
showSnackbar()
5653

57-
smartAuthViewModel.buildCredential(activity, null)
58-
5954
if (loginViewModel.isLoggedIn())
6055
popBackStack()
6156

@@ -64,30 +59,12 @@ class LoginFragment : Fragment() {
6459
hideSoftKeyboard(context, rootView)
6560
}
6661

67-
smartAuthViewModel.id
68-
.nonNull()
69-
.observe(viewLifecycleOwner, Observer {
70-
email.text = SpannableStringBuilder(it)
71-
})
72-
73-
smartAuthViewModel.password
74-
.nonNull()
75-
.observe(viewLifecycleOwner, Observer {
76-
password.text = SpannableStringBuilder(it)
77-
})
78-
7962
loginViewModel.progress
8063
.nonNull()
8164
.observe(viewLifecycleOwner, Observer {
8265
progressDialog.show(it)
8366
})
8467

85-
smartAuthViewModel.progress
86-
.nonNull()
87-
.observe(viewLifecycleOwner, Observer {
88-
progressDialog.show(it)
89-
})
90-
9168
loginViewModel.showNoInternetDialog
9269
.nonNull()
9370
.observe(viewLifecycleOwner, Observer {
@@ -167,18 +144,12 @@ class LoginFragment : Fragment() {
167144
loginViewModel.user
168145
.nonNull()
169146
.observe(viewLifecycleOwner, Observer {
170-
smartAuthViewModel.saveCredential(activity, email.text.toString(), password.text.toString())
171147
popBackStack()
172148
})
173149

174150
return rootView
175151
}
176152

177-
override fun onStart() {
178-
super.onStart()
179-
smartAuthViewModel.requestCredentials(activity)
180-
}
181-
182153
private fun popBackStack() {
183154
findNavController(rootView).popBackStack()
184155
Snackbar.make(rootView, R.string.welcome_back, Snackbar.LENGTH_SHORT).show()

app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import kotlinx.android.synthetic.main.fragment_signup.view.signupNestedScrollVie
3131
import kotlinx.android.synthetic.main.fragment_signup.view.signUpText
3232
import kotlinx.android.synthetic.main.fragment_signup.view.signUpCheckbox
3333
import org.fossasia.openevent.general.R
34-
import org.fossasia.openevent.general.search.SmartAuthViewModel
3534
import org.fossasia.openevent.general.utils.Utils
3635
import org.fossasia.openevent.general.utils.Utils.show
3736
import org.fossasia.openevent.general.utils.extensions.nonNull
@@ -45,7 +44,6 @@ import android.text.style.ClickableSpan
4544
class SignUpFragment : Fragment() {
4645

4746
private val signUpViewModel by viewModel<SignUpViewModel>()
48-
private val smartAuthViewModel by viewModel<SmartAuthViewModel>()
4947
private lateinit var rootView: View
5048

5149
override fun onCreateView(
@@ -161,9 +159,6 @@ class SignUpFragment : Fragment() {
161159
signUpViewModel.loggedIn
162160
.nonNull()
163161
.observe(viewLifecycleOwner, Observer {
164-
smartAuthViewModel.saveCredential(
165-
activity, usernameSignUp.text.toString(),
166-
passwordSignUp.text.toString())
167162
redirectToMain()
168163
})
169164

app/src/main/java/org/fossasia/openevent/general/di/Modules.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import org.fossasia.openevent.general.paypal.PaypalApi
5858
import org.fossasia.openevent.general.search.GeoLocationViewModel
5959
import org.fossasia.openevent.general.search.SearchLocationViewModel
6060
import org.fossasia.openevent.general.search.SearchViewModel
61-
import org.fossasia.openevent.general.search.SmartAuthViewModel
6261
import org.fossasia.openevent.general.search.LocationService
6362
import org.fossasia.openevent.general.search.LocationServiceImpl
6463
import org.fossasia.openevent.general.settings.SettingsViewModel
@@ -151,7 +150,6 @@ val viewModelModule = module {
151150
viewModel { OrderDetailsViewModel(get(), get(), get()) }
152151
viewModel { EditProfileViewModel(get(), get(), get()) }
153152
viewModel { GeoLocationViewModel(get()) }
154-
viewModel { SmartAuthViewModel() }
155153
}
156154

157155
val networkModule = module {

0 commit comments

Comments
 (0)