Skip to content

fix: Disable Google Credentials Sign In leading to crash #1534

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

Merged
merged 1 commit into from
Apr 6, 2019
Merged

fix: Disable Google Credentials Sign In leading to crash #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.fossasia.openevent.general

import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.NavController
Expand All @@ -11,9 +10,6 @@ import kotlinx.android.synthetic.main.activity_main.navigation
import kotlinx.android.synthetic.main.activity_main.navigationAuth
import kotlinx.android.synthetic.main.activity_main.mainFragmentCoordinatorLayout
import org.fossasia.openevent.general.auth.EditProfileFragment
import org.fossasia.openevent.general.search.RC_CREDENTIALS_READ
import org.fossasia.openevent.general.search.RC_CREDENTIALS_SAVE
import org.fossasia.openevent.general.search.SmartAuthViewModel
import org.fossasia.openevent.general.utils.Utils.navAnimGone
import org.fossasia.openevent.general.utils.Utils.navAnimVisible

Expand Down Expand Up @@ -93,13 +89,6 @@ class MainActivity : AppCompatActivity() {
fun onSuperBackPressed() {
super.onBackPressed()
}

override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == RC_CREDENTIALS_READ || requestCode == RC_CREDENTIALS_SAVE)
SmartAuthViewModel().onActivityResult(requestCode, resultCode, data, this)
else
super.onActivityResult(requestCode, resultCode, data)
}
}

interface ScrollToTop {
Expand Down
29 changes: 0 additions & 29 deletions app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.fossasia.openevent.general.auth

import android.os.Bundle
import android.text.Editable
import android.text.SpannableStringBuilder
import android.text.TextWatcher
import android.view.LayoutInflater
import android.view.MenuItem
Expand All @@ -27,7 +26,6 @@ import kotlinx.android.synthetic.main.fragment_login.view.loginLayout
import kotlinx.android.synthetic.main.fragment_login.view.sentEmailLayout
import kotlinx.android.synthetic.main.fragment_login.view.tick
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.search.SmartAuthViewModel
import org.fossasia.openevent.general.utils.Utils
import org.fossasia.openevent.general.utils.Utils.show
import org.fossasia.openevent.general.utils.Utils.hideSoftKeyboard
Expand All @@ -38,7 +36,6 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
class LoginFragment : Fragment() {

private val loginViewModel by viewModel<LoginViewModel>()
private val smartAuthViewModel by viewModel<SmartAuthViewModel>()
private lateinit var rootView: View
private val safeArgs: LoginFragmentArgs by navArgs()

Expand All @@ -54,8 +51,6 @@ class LoginFragment : Fragment() {
setHasOptionsMenu(true)
showSnackbar()

smartAuthViewModel.buildCredential(activity, null)

if (loginViewModel.isLoggedIn())
popBackStack()

Expand All @@ -64,30 +59,12 @@ class LoginFragment : Fragment() {
hideSoftKeyboard(context, rootView)
}

smartAuthViewModel.id
.nonNull()
.observe(viewLifecycleOwner, Observer {
email.text = SpannableStringBuilder(it)
})

smartAuthViewModel.password
.nonNull()
.observe(viewLifecycleOwner, Observer {
password.text = SpannableStringBuilder(it)
})

loginViewModel.progress
.nonNull()
.observe(viewLifecycleOwner, Observer {
progressDialog.show(it)
})

smartAuthViewModel.progress
.nonNull()
.observe(viewLifecycleOwner, Observer {
progressDialog.show(it)
})

loginViewModel.showNoInternetDialog
.nonNull()
.observe(viewLifecycleOwner, Observer {
Expand Down Expand Up @@ -167,18 +144,12 @@ class LoginFragment : Fragment() {
loginViewModel.user
.nonNull()
.observe(viewLifecycleOwner, Observer {
smartAuthViewModel.saveCredential(activity, email.text.toString(), password.text.toString())
popBackStack()
})

return rootView
}

override fun onStart() {
super.onStart()
smartAuthViewModel.requestCredentials(activity)
}

private fun popBackStack() {
findNavController(rootView).popBackStack()
Snackbar.make(rootView, R.string.welcome_back, Snackbar.LENGTH_SHORT).show()
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import kotlinx.android.synthetic.main.fragment_signup.view.signupNestedScrollVie
import kotlinx.android.synthetic.main.fragment_signup.view.signUpText
import kotlinx.android.synthetic.main.fragment_signup.view.signUpCheckbox
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.search.SmartAuthViewModel
import org.fossasia.openevent.general.utils.Utils
import org.fossasia.openevent.general.utils.Utils.show
import org.fossasia.openevent.general.utils.extensions.nonNull
Expand All @@ -45,7 +44,6 @@ import android.text.style.ClickableSpan
class SignUpFragment : Fragment() {

private val signUpViewModel by viewModel<SignUpViewModel>()
private val smartAuthViewModel by viewModel<SmartAuthViewModel>()
private lateinit var rootView: View

override fun onCreateView(
Expand Down Expand Up @@ -161,9 +159,6 @@ class SignUpFragment : Fragment() {
signUpViewModel.loggedIn
.nonNull()
.observe(viewLifecycleOwner, Observer {
smartAuthViewModel.saveCredential(
activity, usernameSignUp.text.toString(),
passwordSignUp.text.toString())
redirectToMain()
})

Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/di/Modules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import org.fossasia.openevent.general.paypal.PaypalApi
import org.fossasia.openevent.general.search.GeoLocationViewModel
import org.fossasia.openevent.general.search.SearchLocationViewModel
import org.fossasia.openevent.general.search.SearchViewModel
import org.fossasia.openevent.general.search.SmartAuthViewModel
import org.fossasia.openevent.general.search.LocationService
import org.fossasia.openevent.general.search.LocationServiceImpl
import org.fossasia.openevent.general.settings.SettingsViewModel
Expand Down Expand Up @@ -151,7 +150,6 @@ val viewModelModule = module {
viewModel { OrderDetailsViewModel(get(), get(), get()) }
viewModel { EditProfileViewModel(get(), get(), get()) }
viewModel { GeoLocationViewModel(get()) }
viewModel { SmartAuthViewModel() }
}

val networkModule = module {
Expand Down