Skip to content

fix(e2ee): check #17248

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

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

fix(e2ee): check #17248

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
6 changes: 3 additions & 3 deletions ...main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.apache.commons.httpclient.HttpStatus
import java.io.IOException
import java.lang.ref.WeakReference
import javax.inject.Inject
Expand Down Expand Up @@ -309,11 +310,10 @@ class SetupEncryptionDialogFragment :

val certificateOperation = GetPublicKeyRemoteOperation()
val certificateResult = certificateOperation.executeNextcloudClient(user, weakContext)
val savedPrivateKey = dataProvider.getValue(user.accountName, EncryptionUtils.PRIVATE_KEY)
if (!certificateResult.isSuccess) {
// The certificate might not be available on the server yet.
// Therefore, the user needs to generate a new passphrase first.
return@withContext if (savedPrivateKey.isEmpty()) {
// Therefore, the user needs to generate a new passphrase first, send csr.
return@withContext if (certificateResult.httpCode == HttpStatus.SC_NOT_FOUND) {
DownloadKeyResult.Success(null)
} else {
DownloadKeyResult.CertificateUnavailable()
Expand Down
Loading