arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-22 20:42:04 +00:00
Code Issues Releases Wiki Activity

LoginCredentials: fix crash with fragment.

Browse Source 
All Fragment classes you create must have a public, no-arg constructor.
This commit is contained in:
Tom Hacohen 2020-10-27 08:43:44 +02:00
parent 5cd8ea82ff
commit 841a1f0fd9
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt
View File

@ -73,7 +73,7 @@ class SignupFragment(private val initialUsername: String?, private val initialPa
val login = v.findViewById<Button>(R.id.login) val login = v.findViewById<Button>(R.id.login)
login.setOnClickListener { login.setOnClickListener {
parentFragmentManager.commit { parentFragmentManager.commit {
replace(android.R.id.content, LoginCredentialsFragment(editUserName.editText?.text.toString(), editPassword.editText?.text.toString())) replace(android.R.id.content, LoginCredentialsFragment.newInstance(editUserName.editText?.text.toString(), editPassword.editText?.text.toString()))
} }
} }

2
app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.kt
View File

@ -30,7 +30,7 @@ class LoginActivity : BaseActivity() {
if (savedInstanceState == null) if (savedInstanceState == null)
// first call, add fragment // first call, add fragment
supportFragmentManager.beginTransaction() supportFragmentManager.beginTransaction()
.replace(android.R.id.content, LoginCredentialsFragment(null, null)) .replace(android.R.id.content, LoginCredentialsFragment())
.commit() .commit()
} }

14
app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt
View File

@ -29,13 +29,16 @@ import net.cachapa.expandablelayout.ExpandableLayout
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import java.net.URI import java.net.URI
class LoginCredentialsFragment(private val initialUsername: String?, private val initialPassword: String?) : Fragment() { class LoginCredentialsFragment : Fragment() {
internal lateinit var editUserName: EditText internal lateinit var editUserName: EditText
internal lateinit var editUrlPassword: TextInputLayout internal lateinit var editUrlPassword: TextInputLayout
internal lateinit var showAdvanced: CheckedTextView internal lateinit var showAdvanced: CheckedTextView
internal lateinit var customServer: EditText internal lateinit var customServer: EditText
internal var initialUsername: String? = null
internal var initialPassword: String? = null
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val v = inflater.inflate(R.layout.login_credentials_fragment, container, false) val v = inflater.inflate(R.layout.login_credentials_fragment, container, false)
@ -119,4 +122,13 @@ class LoginCredentialsFragment(private val initialUsername: String?, private val
return if (valid) LoginCredentials(uri, userName, password) else null return if (valid) LoginCredentials(uri, userName, password) else null
} }
companion object {
fun newInstance(initialUsername: String?, initialPassword: String?): LoginCredentialsFragment {
val ret = LoginCredentialsFragment()
ret.initialUsername = initialUsername
ret.initialPassword = initialPassword
return ret
}
}
} }