diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-05-26 22:56:17 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-05-26 22:56:17 +0200 |
commit | a554be18a60380d624fc9c65416368775cba9bae (patch) | |
tree | be455ef73e0c047a47bd71651382f2d22dd115ab /src/main/java/de/pixart/messenger/ui/EditAccountActivity.java | |
parent | 369e48c2203a694088156574dd7c7044f68e907b (diff) |
add support for S3 file transfers
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/EditAccountActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 464ebde0f..8b79ba09f 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -125,7 +125,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat boolean openPaymentUrl = mAccount != null && mAccount.getStatus() == Account.State.PAYMENT_REQUIRED; final boolean redirectionWorthyStatus = openPaymentUrl || openRegistrationUrl; URL url = connection != null && redirectionWorthyStatus ? connection.getRedirectionUrl() : null; - if (url != null && redirectionWorthyStatus && !wasDisabled) { + if (url != null && !wasDisabled) { try { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url.toString()))); overridePendingTransition(R.animator.fade_in, R.animator.fade_out); @@ -1018,6 +1018,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } if (features.httpUpload(0)) { this.binding.serverInfoHttpUpload.setText(R.string.server_info_available); + } + if (features.p1S3FileTransfer()) { + this.binding.serverInfoHttpUploadDescription.setText(R.string.p1_s3_filetransfer); + this.binding.serverInfoHttpUpload.setText(R.string.server_info_available); } else { this.binding.serverInfoHttpUpload.setText(R.string.server_info_unavailable); } |