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

Fix adding journal members following an encryption password change.

Browse Source 
See previous commit for more details about this issue.
This commit is contained in:
Tom Hacohen 2019-03-10 18:59:28 +00:00
parent 9f0b492c42
commit a605c2ae49
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt
View File

@ -16,6 +16,7 @@ import com.etesync.syncadapter.journalmanager.Crypto
import com.etesync.syncadapter.journalmanager.JournalManager import com.etesync.syncadapter.journalmanager.JournalManager
import com.etesync.syncadapter.journalmanager.UserInfoManager import com.etesync.syncadapter.journalmanager.UserInfoManager
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import okhttp3.HttpUrl import okhttp3.HttpUrl
class AddMemberFragment : DialogFragment() { class AddMemberFragment : DialogFragment() {
@ -100,13 +101,22 @@ class AddMemberFragment : DialogFragment() {
private inner class MemberAddSecond : AsyncTask<Void, Void, MemberAddSecond.AddResultSecond>() { private inner class MemberAddSecond : AsyncTask<Void, Void, MemberAddSecond.AddResultSecond>() {
override fun doInBackground(vararg voids: Void): AddResultSecond { override fun doInBackground(vararg voids: Void): AddResultSecond {
try { try {
val httpClient = HttpClient.create(ctx!!, settings!!) val settings = settings!!
val httpClient = HttpClient.create(ctx!!, settings)
val journalsManager = JournalManager(httpClient, remote!!) val journalsManager = JournalManager(httpClient, remote!!)
val journal = JournalManager.Journal.fakeWithUid(info.uid!!) val data = (ctx!!.applicationContext as App).data
val crypto = Crypto.CryptoManager(info.version, settings!!.password(), info.uid!!) val journalEntity = JournalEntity.fetchOrCreate(data, info)
val encryptedKey = crypto.getEncryptedKey(settings!!.keyPair!!, memberPubKey) val crypto: Crypto.CryptoManager
if (journalEntity.encryptedKey != null) {
crypto = Crypto.CryptoManager(info.version, settings.keyPair!!, journalEntity.encryptedKey)
} else {
crypto = Crypto.CryptoManager(info.version, settings.password(), info.uid!!)
}
val journal = JournalManager.Journal.fakeWithUid(info.uid!!)
val encryptedKey = crypto.getEncryptedKey(settings.keyPair!!, memberPubKey)
val member = JournalManager.Member(memberEmail, encryptedKey!!, readOnly) val member = JournalManager.Member(memberEmail, encryptedKey!!, readOnly)
journalsManager.addMember(journal, member) journalsManager.addMember(journal, member)
return AddResultSecond(null) return AddResultSecond(null)