arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-08-02 11:58:05 +00:00
Code Issues Releases Wiki Activity

Fix crash when removing journal members

Browse Source
This commit is contained in:
Tom Hacohen 2019-03-21 15:41:06 +00:00
parent d04d0f902f
commit dcc3ec6f88
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,6 @@ import okhttp3.OkHttpClient
class RemoveMemberFragment : DialogFragment() { class RemoveMemberFragment : DialogFragment() {
private var settings: AccountSettings? = null private var settings: AccountSettings? = null
private var httpClient: OkHttpClient? = null
private var remote: HttpUrl? = null
private var info: CollectionInfo? = null private var info: CollectionInfo? = null
private var memberEmail: String? = null private var memberEmail: String? = null
@ -27,13 +25,10 @@ class RemoveMemberFragment : DialogFragment() {
memberEmail = arguments!!.getString(KEY_MEMBER) memberEmail = arguments!!.getString(KEY_MEMBER)
try { try {
settings = AccountSettings(context!!, account!!) settings = AccountSettings(context!!, account!!)
httpClient = HttpClient.Builder(context, settings).build().okHttpClient
} catch (e: InvalidAccountException) { } catch (e: InvalidAccountException) {
e.printStackTrace() e.printStackTrace()
} }
remote = HttpUrl.get(settings!!.uri!!)
MemberRemove().execute() MemberRemove().execute()
} }
@ -49,8 +44,12 @@ class RemoveMemberFragment : DialogFragment() {
private inner class MemberRemove : AsyncTask<Void, Void, MemberRemove.RemoveResult>() { private inner class MemberRemove : AsyncTask<Void, Void, MemberRemove.RemoveResult>() {
override fun doInBackground(vararg voids: Void): RemoveResult { override fun doInBackground(vararg voids: Void): RemoveResult {
val httpClient = HttpClient.Builder(context, settings).build()
try { try {
val journalsManager = JournalManager(httpClient!!, remote!!) val remote = HttpUrl.get(settings!!.uri!!)
val journalsManager = JournalManager(httpClient.okHttpClient, remote!!)
val journal = JournalManager.Journal.fakeWithUid(info!!.uid!!) val journal = JournalManager.Journal.fakeWithUid(info!!.uid!!)
val member = JournalManager.Member(memberEmail!!, "placeholder".toByteArray()) val member = JournalManager.Member(memberEmail!!, "placeholder".toByteArray())
@ -59,8 +58,9 @@ class RemoveMemberFragment : DialogFragment() {
return RemoveResult(null) return RemoveResult(null)
} catch (e: Exception) { } catch (e: Exception) {
return RemoveResult(e) return RemoveResult(e)
} finally {
httpClient.close()
} }
} }
override fun onPostExecute(result: RemoveResult) { override fun onPostExecute(result: RemoveResult) {