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

Remove redundant null assertions.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-09 09:54:55 +00:00
parent 3729401aac
commit 594aacf396
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt
View File

@ -32,10 +32,10 @@ class SetupUserInfoFragment : DialogFragment() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
account = arguments!!.getParcelable(KEY_ACCOUNT) account = arguments!!.getParcelable(KEY_ACCOUNT)!!
try { try {
settings = AccountSettings(context!!, account!!) settings = AccountSettings(context!!, account)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} }
@ -47,19 +47,19 @@ class SetupUserInfoFragment : DialogFragment() {
override fun doInBackground(vararg accounts: Account): SetupUserInfo.SetupUserInfoResult { override fun doInBackground(vararg accounts: Account): SetupUserInfo.SetupUserInfoResult {
try { try {
val cryptoManager: Crypto.CryptoManager val cryptoManager: Crypto.CryptoManager
val httpClient = HttpClient.create(context!!, settings!!) val httpClient = HttpClient.create(context, settings)
val userInfoManager = UserInfoManager(httpClient, HttpUrl.get(settings!!.uri!!)!!) val userInfoManager = UserInfoManager(httpClient, HttpUrl.get(settings.uri)!!)
var userInfo: UserInfoManager.UserInfo? = userInfoManager[account!!.name] var userInfo: UserInfoManager.UserInfo? = userInfoManager[account.name]
if (userInfo == null) { if (userInfo == null) {
App.log.info("Creating userInfo for " + account!!.name) App.log.info("Creating userInfo for " + account.name)
cryptoManager = Crypto.CryptoManager(Constants.CURRENT_VERSION, settings!!.password(), "userInfo") cryptoManager = Crypto.CryptoManager(Constants.CURRENT_VERSION, settings.password(), "userInfo")
userInfo = UserInfoManager.UserInfo.generate(cryptoManager, account!!.name) userInfo = UserInfoManager.UserInfo.generate(cryptoManager, account.name)
userInfoManager.create(userInfo) userInfoManager.create(userInfo)
} else { } else {
App.log.info("Fetched userInfo for " + account!!.name) App.log.info("Fetched userInfo for " + account.name)
cryptoManager = Crypto.CryptoManager(userInfo.version!!.toInt(), settings!!.password(), "userInfo") cryptoManager = Crypto.CryptoManager(userInfo.version!!.toInt(), settings.password(), "userInfo")
userInfo.verify(cryptoManager) userInfo.verify(cryptoManager)
} }
@ -75,7 +75,7 @@ class SetupUserInfoFragment : DialogFragment() {
override fun onPostExecute(result: SetupUserInfoResult) { override fun onPostExecute(result: SetupUserInfoResult) {
if (result.exception == null) { if (result.exception == null) {
settings!!.keyPair = result.keyPair settings.keyPair = result.keyPair
} else { } else {
val dialog = AlertDialog.Builder(activity!!) val dialog = AlertDialog.Builder(activity!!)
.setTitle(R.string.login_user_info_error_title) .setTitle(R.string.login_user_info_error_title)