diff --git a/.gitignore b/.gitignore index fef0bbadd..eae4d3884 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ app/src/beta/google-services.json .idea/**/tasks.xml .idea/**/usage.statistics.xml .idea/**/dictionaries/** +.idea/assetWizardSettings.xml # Do not exclude project Dictionary !.idea/**/dictionaries/project.xml .idea/**/shelf diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6ab9ebd80..e366576b0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -302,7 +302,7 @@ { handleCreatePaymentTokenResponse(createPaymentTokenResponse, paymentMethod.getCardDetails().getPayer() == null ? PAYMENT_TYPE_CARD : PAYMENT_TYPE_PAYPAL); @@ -540,10 +535,6 @@ private void handlePaymentTokenStatusChange(@NonNull PaymentToken.Status status, case UPGRADE: viewModel.createSubscriptionForPaymentToken(token, amount, currency, planIds, cycle, couponCode); break; - case DONATE: - mListener.donateForPaymentToken(amount, currency, token); - mProgressContainer.setVisibility(View.VISIBLE); - break; } break; case FAILED: @@ -671,17 +662,6 @@ private void onCreateSubscriptionResult(CreateSubscriptionResult result) { } } - @Subscribe - public void onDonateEvent(DonateEvent event) { - if (event.getStatus() == Status.SUCCESS) { - showSuccessPage(); - new Handler().postDelayed(() -> mListener.donateDone(), PAYMENT_SUCCESS_PAGE_TIMEOUT); - } else { - mProgressContainer.setVisibility(View.GONE); - showPaymentError(event.getError(), event.getErrorDescription()); - } - } - private void clearFields() { creditCardNameEditText.setText(""); creditCardNumberEditText.setText(""); @@ -704,7 +684,7 @@ private void showPaymentError(String error, String errorDescription) { View dialogView; if (billingType == Constants.BillingType.CREATE) { dialogView = inflater.inflate(R.layout.layout_payment_error_create_account, null); - } else if (billingType == Constants.BillingType.UPGRADE || billingType == Constants.BillingType.DONATE) { + } else if (billingType == Constants.BillingType.UPGRADE) { dialogView = inflater.inflate(R.layout.layout_payment_error_upgrade, null); } else { return; diff --git a/app/src/main/java/ch/protonmail/android/activities/fragments/CreateAccountBaseFragment.java b/app/src/main/java/ch/protonmail/android/activities/fragments/CreateAccountBaseFragment.java index ff807e59f..a336525a9 100644 --- a/app/src/main/java/ch/protonmail/android/activities/fragments/CreateAccountBaseFragment.java +++ b/app/src/main/java/ch/protonmail/android/activities/fragments/CreateAccountBaseFragment.java @@ -422,8 +422,6 @@ public interface ICreateAccountListener { void onPaymentOptionChosen(Constants.CurrencyType currency, int amount, String planId, int cycle); - void donateForPaymentToken(int amount, Constants.CurrencyType currency, String paymentToken); - Constants.CurrencyType getCurrency(); int getAmount(); @@ -449,8 +447,6 @@ public interface ICreateAccountListener { */ void replaceFragment(Fragment fragment, String backstackName); - void donateDone(); - void getAvailableDomains(); void startAddressSetup(); diff --git a/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountActivity.java b/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountActivity.java index b46fe04b8..4c1028a34 100644 --- a/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountActivity.java +++ b/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountActivity.java @@ -400,11 +400,6 @@ public void onPaymentOptionChosen(Constants.CurrencyType currency, int amount, S this.selectedCycle = cycle; } - @Override - public void donateForPaymentToken(int amount, Constants.CurrencyType currency, String paymentToken) { - // noop - } - @Override public Constants.CurrencyType getCurrency() { return currency; @@ -499,11 +494,6 @@ public void replaceFragment(Fragment fragment, String backstackName) { fragmentTransaction.commitAllowingStateLoss(); } - @Override - public void donateDone() { - // noop - } - @Override public void getAvailableDomains() { GetAvailableDomainsJob availableDomainsJob = new GetAvailableDomainsJob(true); diff --git a/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountFeedbackActivity.java b/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountFeedbackActivity.java index b46aaddb3..1747da659 100644 --- a/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountFeedbackActivity.java +++ b/app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountFeedbackActivity.java @@ -199,11 +199,6 @@ public void onPaymentOptionChosen(Constants.CurrencyType currency, int amount, S // noop } - @Override - public void donateForPaymentToken(int amount, Constants.CurrencyType currency, String paymentToken) { - // noop - } - @Override public Constants.CurrencyType getCurrency() { return null; @@ -255,11 +250,6 @@ public void replaceFragment(Fragment fragment, String backstackName) { // noop } - @Override - public void donateDone() { - // noop - } - @Override public void getAvailableDomains() { // noop diff --git a/app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt b/app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt index c0723034f..b9b01b95d 100644 --- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt +++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt @@ -500,20 +500,16 @@ internal class MessageDetailsViewModel @ViewModelInject constructor( val metadata = attachmentMetadataDatabase .getAttachmentMetadataForMessageAndAttachmentId(messageId, attachmentToDownloadId) Timber.v("viewOrDownloadAttachment Id: $attachmentToDownloadId metadataId: ${metadata?.id}") - if (metadata != null) { - val uri = metadata.uri - if (uri != null && attachmentsHelper.isFileAvailable(context, uri)) { - if (uri.path?.contains(DIR_EMB_ATTACHMENT_DOWNLOADS) == true) { - copyAttachmentToDownloadsAndDisplay(context, metadata.name, uri) - } else { - viewAttachment(context, metadata.name, uri) - } + val uri = metadata?.uri + // extra check if user has not deleted the file + if (uri != null && attachmentsHelper.isFileAvailable(context, uri)) { + if (uri.path?.contains(DIR_EMB_ATTACHMENT_DOWNLOADS) == true) { + copyAttachmentToDownloadsAndDisplay(context, metadata.name, uri) } else { - Timber.v("No file attachment id: $attachmentToDownloadId downloading again") - attachmentsWorker.enqueue(messageId, userManager.username, attachmentToDownloadId) + viewAttachment(context, metadata.name, uri) } } else { - Timber.v("No metadata found for attachment id: $attachmentToDownloadId") + Timber.d("Attachment id: $attachmentToDownloadId file not available, uri: $uri ") attachmentsWorker.enqueue(messageId, userManager.username, attachmentToDownloadId) } } diff --git a/app/src/main/java/ch/protonmail/android/api/ProtonMailApiManager.kt b/app/src/main/java/ch/protonmail/android/api/ProtonMailApiManager.kt index 1e38fd7fd..f2e4d2060 100644 --- a/app/src/main/java/ch/protonmail/android/api/ProtonMailApiManager.kt +++ b/app/src/main/java/ch/protonmail/android/api/ProtonMailApiManager.kt @@ -36,7 +36,6 @@ import ch.protonmail.android.api.models.CreateSubscriptionBody import ch.protonmail.android.api.models.CreateUpdateSubscriptionResponse import ch.protonmail.android.api.models.DeleteContactResponse import ch.protonmail.android.api.models.DirectEnabledResponse -import ch.protonmail.android.api.models.DonateBody import ch.protonmail.android.api.models.DraftBody import ch.protonmail.android.api.models.GetPaymentTokenResponse import ch.protonmail.android.api.models.GetSubscriptionResponse @@ -363,8 +362,6 @@ class ProtonMailApiManager @Inject constructor(var api: ProtonMailApi) : override suspend fun checkSubscription(body: CheckSubscriptionBody): CheckSubscriptionResponse = api.checkSubscription(body) - override fun donate(body: DonateBody): ResponseBody? = api.donate(body) - override suspend fun createUpdateSubscription(body: CreateSubscriptionBody): CreateUpdateSubscriptionResponse = api.createUpdateSubscription(body) diff --git a/app/src/main/java/ch/protonmail/android/api/models/DonateBody.java b/app/src/main/java/ch/protonmail/android/api/models/DonateBody.java deleted file mode 100644 index f654df0bb..000000000 --- a/app/src/main/java/ch/protonmail/android/api/models/DonateBody.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2020 Proton Technologies AG - * - * This file is part of ProtonMail. - * - * ProtonMail is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * ProtonMail is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with ProtonMail. If not, see https://www.gnu.org/licenses/. - */ -package ch.protonmail.android.api.models; - -import com.google.gson.annotations.SerializedName; - -import ch.protonmail.android.api.utils.Fields; -import ch.protonmail.android.core.Constants; - -public class DonateBody { - @SerializedName(Fields.Payment.AMOUNT) - public int amount; - @SerializedName(Fields.Payment.CURRENCY) - public String currency; - @SerializedName(Fields.Payment.PAYMENT) - public PaymentBody payment; - - public DonateBody(String paymentToken, int amount, Constants.CurrencyType currency) { - this.amount = amount; - this.currency = currency.name(); - this.payment = new TokenPaymentBody(paymentToken); - } -} diff --git a/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApi.kt b/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApi.kt index 5adfde0c4..9457fef90 100644 --- a/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApi.kt +++ b/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApi.kt @@ -25,7 +25,6 @@ import ch.protonmail.android.api.models.CreatePaymentTokenBody import ch.protonmail.android.api.models.CreatePaymentTokenSuccessResponse import ch.protonmail.android.api.models.CreateSubscriptionBody import ch.protonmail.android.api.models.CreateUpdateSubscriptionResponse -import ch.protonmail.android.api.models.DonateBody import ch.protonmail.android.api.models.GetPaymentTokenResponse import ch.protonmail.android.api.models.GetSubscriptionResponse import ch.protonmail.android.api.models.PaymentMethodResponse @@ -57,9 +56,6 @@ class PaymentApi( override suspend fun createUpdateSubscription(body: CreateSubscriptionBody): CreateUpdateSubscriptionResponse = service.createUpdateSubscription(body) - @Throws(IOException::class) - override fun donate(body: DonateBody): ResponseBody = ParseUtils.parse(service.donate(body).execute()) - override suspend fun checkSubscription(body: CheckSubscriptionBody): CheckSubscriptionResponse = service.checkSubscription(body) diff --git a/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApiSpec.kt b/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApiSpec.kt index 9a0b468e2..b0e12f5be 100644 --- a/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApiSpec.kt +++ b/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentApiSpec.kt @@ -25,7 +25,6 @@ import ch.protonmail.android.api.models.CreatePaymentTokenBody import ch.protonmail.android.api.models.CreatePaymentTokenSuccessResponse import ch.protonmail.android.api.models.CreateSubscriptionBody import ch.protonmail.android.api.models.CreateUpdateSubscriptionResponse -import ch.protonmail.android.api.models.DonateBody import ch.protonmail.android.api.models.GetPaymentTokenResponse import ch.protonmail.android.api.models.GetSubscriptionResponse import ch.protonmail.android.api.models.PaymentMethodResponse @@ -49,9 +48,6 @@ interface PaymentApiSpec { suspend fun checkSubscription(body: CheckSubscriptionBody): CheckSubscriptionResponse - @Throws(IOException::class) - fun donate(body: DonateBody): ResponseBody? - suspend fun createUpdateSubscription(body: CreateSubscriptionBody): CreateUpdateSubscriptionResponse suspend fun createUpdatePaymentMethod(body: TokenPaymentBody): PaymentMethodResponse diff --git a/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentService.kt b/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentService.kt index 0becdb6fc..2181467d4 100644 --- a/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentService.kt +++ b/app/src/main/java/ch/protonmail/android/api/segments/payment/PaymentService.kt @@ -22,7 +22,6 @@ import ch.protonmail.android.api.models.CheckSubscriptionBody import ch.protonmail.android.api.models.CheckSubscriptionResponse import ch.protonmail.android.api.models.CreateSubscriptionBody import ch.protonmail.android.api.models.CreateUpdateSubscriptionResponse -import ch.protonmail.android.api.models.DonateBody import ch.protonmail.android.api.models.GetSubscriptionResponse import ch.protonmail.android.api.models.PaymentMethodResponse import ch.protonmail.android.api.models.PaymentMethodsResponse @@ -59,10 +58,6 @@ interface PaymentService { @Headers(CONTENT_TYPE, ACCEPT_HEADER_V1) suspend fun createUpdateSubscription(@Body body: CreateSubscriptionBody): CreateUpdateSubscriptionResponse - @POST("payments/donate") - @Headers(CONTENT_TYPE, ACCEPT_HEADER_V1) - fun donate(@Body body: DonateBody): Call - @POST("payments/subscription/check") @Headers(CONTENT_TYPE, ACCEPT_HEADER_V1) suspend fun checkSubscription(@Body body: CheckSubscriptionBody): CheckSubscriptionResponse diff --git a/app/src/main/java/ch/protonmail/android/attachments/AttachmentsHelper.kt b/app/src/main/java/ch/protonmail/android/attachments/AttachmentsHelper.kt index da04f583b..894989c00 100644 --- a/app/src/main/java/ch/protonmail/android/attachments/AttachmentsHelper.kt +++ b/app/src/main/java/ch/protonmail/android/attachments/AttachmentsHelper.kt @@ -120,6 +120,7 @@ class AttachmentsHelper @Inject constructor() { } val newUri = contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, values) + Timber.v("saveAttachment attachmentMimeType: $attachmentMimeType, newUri: $newUri") newUri?.let { contentResolver.openOutputStream(newUri)?.use { outputStream -> diff --git a/app/src/main/java/ch/protonmail/android/attachments/HandleSingleAttachment.kt b/app/src/main/java/ch/protonmail/android/attachments/HandleSingleAttachment.kt index 962af9366..83593ec34 100644 --- a/app/src/main/java/ch/protonmail/android/attachments/HandleSingleAttachment.kt +++ b/app/src/main/java/ch/protonmail/android/attachments/HandleSingleAttachment.kt @@ -25,6 +25,7 @@ import android.media.MediaScannerConnection import android.net.Uri import android.os.Build import android.os.Environment +import android.webkit.MimeTypeMap import androidx.work.ListenableWorker import ch.protonmail.android.api.models.room.attachmentMetadata.AttachmentMetadata import ch.protonmail.android.api.models.room.attachmentMetadata.AttachmentMetadataDatabase @@ -106,10 +107,17 @@ class HandleSingleAttachment @Inject constructor( private suspend fun downloadAttachment(attachment: Attachment, filename: String, crypto: AddressCrypto): Uri? = try { + // Sometimes mime type in attachment.mimeType does not match the file extension type, therefore + // we determinate is again here, just before saving the file. + // This is to prevent problems with saving multiple times a file with same name, which was causing errors + // like saving "invite.ics (1)" instead of "invite (1).ics" + val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension( + filename.substringAfterLast(".", attachment.mimeType ?: "") + ) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - downloadAttachmentForAndroidQ(attachment, filename, crypto) + downloadAttachmentForAndroidQ(attachment, filename, crypto, mimeType) } else { - downloadAttachmentBeforeQ(attachment, filename, crypto) + downloadAttachmentBeforeQ(attachment, filename, crypto, mimeType) } } catch (exception: IOException) { Timber.w(exception, "Unable to download attachment file $filename") @@ -120,7 +128,8 @@ class HandleSingleAttachment @Inject constructor( private suspend fun downloadAttachmentForAndroidQ( attachment: Attachment, filename: String, - crypto: AddressCrypto + crypto: AddressCrypto, + mimeType: String? ): Uri? { val decryptedByteArray = attachmentsRepository.getAttachmentDataOrNull( crypto, @@ -130,7 +139,7 @@ class HandleSingleAttachment @Inject constructor( return decryptedByteArray?.inputStream()?.let { attachmentsHelper.saveAttachmentInMediaStore( - context.contentResolver, filename, attachment.mimeType, it + context.contentResolver, filename, mimeType, it ) } } @@ -138,7 +147,8 @@ class HandleSingleAttachment @Inject constructor( private suspend fun downloadAttachmentBeforeQ( attachment: Attachment, filename: String, - crypto: AddressCrypto + crypto: AddressCrypto, + mimeType: String? ): Uri? { val decryptedByteArray = attachmentsRepository.getAttachmentDataOrNull( @@ -152,7 +162,7 @@ class HandleSingleAttachment @Inject constructor( val result = awaitUriFromMediaScanned( context, file, - attachment.mimeType + mimeType ) val uri = result.second Timber.v("Stored file: $filename path: ${result.first} uri: $uri") diff --git a/app/src/main/java/ch/protonmail/android/core/Constants.kt b/app/src/main/java/ch/protonmail/android/core/Constants.kt index cc2771793..f20da468e 100644 --- a/app/src/main/java/ch/protonmail/android/core/Constants.kt +++ b/app/src/main/java/ch/protonmail/android/core/Constants.kt @@ -311,8 +311,7 @@ object Constants { enum class BillingType { CREATE, - UPGRADE, - DONATE + UPGRADE } enum class TokenType(val tokenTypeValue: String) { diff --git a/app/src/main/java/ch/protonmail/android/events/DonateEvent.java b/app/src/main/java/ch/protonmail/android/events/DonateEvent.java deleted file mode 100644 index 6be94be5c..000000000 --- a/app/src/main/java/ch/protonmail/android/events/DonateEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2020 Proton Technologies AG - * - * This file is part of ProtonMail. - * - * ProtonMail is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * ProtonMail is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with ProtonMail. If not, see https://www.gnu.org/licenses/. - */ -package ch.protonmail.android.events; - -/** - * Created by dkadrikj on 7/9/16. - */ -public class DonateEvent { - private final Status status; - private String error; - private String errorDescription; - - public DonateEvent(Status status) { - this.status = status; - } - - public DonateEvent(Status status, String error, String errorDescription) { - this.status = status; - this.error = error; - this.errorDescription = errorDescription; - } - - public Status getStatus() { - return status; - } - - public String getError() { - return error; - } - - public String getErrorDescription() { - return errorDescription; - } -} diff --git a/app/src/main/java/ch/protonmail/android/jobs/DonateJob.java b/app/src/main/java/ch/protonmail/android/jobs/DonateJob.java deleted file mode 100644 index 892b80fb9..000000000 --- a/app/src/main/java/ch/protonmail/android/jobs/DonateJob.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2020 Proton Technologies AG - * - * This file is part of ProtonMail. - * - * ProtonMail is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * ProtonMail is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with ProtonMail. If not, see https://www.gnu.org/licenses/. - */ -package ch.protonmail.android.jobs; - -import com.birbit.android.jobqueue.Params; - -import java.util.Map; - -import ch.protonmail.android.api.models.DonateBody; -import ch.protonmail.android.api.models.ResponseBody; -import ch.protonmail.android.api.utils.ParseUtils; -import ch.protonmail.android.core.Constants; -import ch.protonmail.android.events.DonateEvent; -import ch.protonmail.android.events.Status; -import ch.protonmail.android.utils.AppUtil; -import ch.protonmail.android.utils.extensions.CollectionExtensions; - -public class DonateJob extends ProtonMailBaseJob { - - private final DonateBody donateBody; - - public DonateJob(String paymentToken, int amount, Constants.CurrencyType currency) { - super(new Params(Priority.HIGH).requireNetwork().groupBy(Constants.JOB_GROUP_PAYMENT)); - donateBody = new DonateBody(paymentToken, amount, currency); - } - - @Override - public void onRun() throws Throwable { - ResponseBody response = getApi().donate(donateBody); - if (response.getCode() == Constants.RESPONSE_CODE_OK) { - AppUtil.postEventOnUi(new DonateEvent(Status.SUCCESS)); - } else { - Map details = CollectionExtensions.filterValues(response.getDetails(), String.class); - AppUtil.postEventOnUi(new DonateEvent(Status.FAILED, response.getError(), ParseUtils.INSTANCE.compileSingleErrorMessage(details))); - } - - } -} diff --git a/app/src/main/res/drawable-v21/donate_button_selector.xml b/app/src/main/res/drawable-v21/donate_button_selector.xml deleted file mode 100644 index f1830a599..000000000 --- a/app/src/main/res/drawable-v21/donate_button_selector.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/donate_button_selector.xml b/app/src/main/res/drawable/donate_button_selector.xml deleted file mode 100644 index 7f698044c..000000000 --- a/app/src/main/res/drawable/donate_button_selector.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/donate_button_shape.xml b/app/src/main/res/drawable/donate_button_shape.xml deleted file mode 100644 index 5c67bc1ae..000000000 --- a/app/src/main/res/drawable/donate_button_shape.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/activity_upselling.xml b/app/src/main/res/layout/activity_upselling.xml index defdd09b6..ce94ae7af 100644 --- a/app/src/main/res/layout/activity_upselling.xml +++ b/app/src/main/res/layout/activity_upselling.xml @@ -188,65 +188,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. android:layout_height="match_parent" android:layout_above="@id/upgrade_info" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index b8c2a9f45..574e4f619 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -385,23 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Tancar sessió de %s? Està segur que desitja tancar la sessió? Es canviarà a %s. - Actualització / Donació ProtonMail és de codi obert i gratuït Necessitem el vostre suport per continuar protegint la privadesa i millorant ProtonMail - Donar Actualització a ProtonMail Plus - La teva donació ens ajudará - a ampliar capacitats i continuar desenvolupant ProtonMail gratuitament i com a programari lliure. És només gràcies al - suport de la comunitat que som capaços de seguir oferint ProtonMail a les persones d\'arreu del món. - Actualització / Donació - Seleccioneu un import de donació o introduïu qualsevol quantitat - 5€ - 15€ - 50€ - 100€ - Introduïu l\'import de la donació - Doneu - Donar a través de PayPal o Bitcoin Tot inclòs al nostre pla gratuït 5 GB d\'emmagatzematge Utilitzeu el vostre propi domini @@ -468,8 +454,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Si us plau, seleccioneu un mètode de pagament Pagament realitzat amb èxit! Ara actualitzem el vostre compte. Espereu un moment. Gràcies pel teu suport! - Donació amb èxit! - El vostre suport és imprescindible per mantenir ProtonMail. Gràcies per recolzar la privacitat d\'internet! Crea un compte gratuït %d GB d\'emmagatzematge %d MB d\'emmagatzematge diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index eeabeb9f6..6e7894538 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -397,24 +397,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Log out %s? Opravdu se chcete odhlásit? Opravdu se chcete odhlásit z aktuálního účtu a pokračovat s %s? - Přejít na vyšší verzi/Přispět ProtonMail je zdarma a open source Potřebujeme Vaši podporu, abychom mohli i nadále chránit soukromí a vylepšovat služby ProtonMail - Přispět Rozšířit na ProtonMail Plus - Váš příspěvek nám pomůže navýšit - naše kapacity a nadále vyvíjet ProtonMail jako bezplatný open source software. Jenom díky - podpoře komunity jsme schopni ProtonMail nadále poskytovat lidem po celém - světě. - Přejít na vyšší verzi/Přispět - Vyberte výši příspěvku nebo zadejte libovolnou částku - 5 eur - 15 eur - 50 eur - 100 eur - Vyberte částku příspěvku - Přispět - Přispet pomocí PayPal nebo Bitcoin Zahrnuto ve verzi zdarma Úložiště o velikosti 5 Gb Použijte svou vlastní doménu @@ -480,8 +465,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Vyberte způsob platby Platba proběhla úspěšně! We are now upgrading your account, please wait a moment. Thank you for your support! - Donation Success! - Your support is essential to keeping ProtonMail running. Thank you for supporting internet privacy! Založit účet zdarma Úložiště o velikosti %d GB Úložiště o velikosti %d Mb diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 63c58027c..7e92f119e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -385,24 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Log out %s? Sikker på, at du vil logge ud? Sikker på, at du vil logge ud af den aktuelle konto og fortsætte ved brug af %s? - Opgradér/Donér ProtonMail er gratis og Open Source Din støtte er nødvendig for at fortsætte med at beskytte privatlivet og forbedre ProtonMail - Donere Opgradér til ProtonMail Plus - Din donation vil hjælpe os med at tilføje - kapacitet og fortsætter udviklingen af ProtonMail som gratis og open source software. Det er kun via - støtte fra fællesskabet, at vi kan fortsætte med at levere ProtonMail til brugere rundt - om i verden. - Opgradere/Donere - Vælg - eller angiv - et donationsbeløb - 5 € - 15 € - 50 € - 100 € - Angiv donationsbeløb - Donér - Donér via PayPal eller Bitcoin Alt inkluderet i vores gratis abonnnement 5 GB lagerplads Benyt dit eget domæne @@ -469,8 +454,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Vælg betalingsmetode Betaling gennemført! Din konto bliver nu opgraderet, afvent venligst. Tak for din støtte! - Donation gennemført! - Din støtte er afgørende for at holde ProtonMail kørende. Tak fordi du støtter Internetfortrolighed! Opret gratis konto %d GB lagerplads %d MB lagerplads diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d042d7538..5c2219c2f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -384,21 +384,9 @@ zu: <br/><br/><u>%s</u><br/><br/> Möchten S %s abmelden? Möchten Sie sich wirklich abmelden? Sie werden zu %s weitergeleitet. - Umsteigen/Spenden ProtonMail ist kostenlos und Quelloffen Wir benötigen Ihre Unterstützung, um die Privatsphäre weiterhin zu schützen und ProtonMail zu verbessern - Spenden Auf ProtonMail Plus umsteigen - Ihre Spende wird uns helfen die Kapazität zu erweitern und ProtonMail weiterhin als eine kostenlose Open-Source-Software zu entwickeln. Nur durch die Unterstützung der Community sind wir in der Lage ProtonMail weiterhin Menschen auf der ganzen Welt zur Verfügung zu stellen. - Umsteigen/Spenden - Wählen Sie einen Spendenbetrag oder geben Sie beliebigen Betrag ein - 5€ - 15€ - 50€ - 100€ - Spendenbetrag eingeben - Spenden - Spenden Sie via PayPal oder Bitcoin Alles in unserem kostenlosen Paket 5GB Speicherplatz Verwenden Sie Ihre eigene Domain @@ -462,8 +450,6 @@ zu: <br/><br/><u>%s</u><br/><br/> Möchten S Bitte eine Zahlungsmethode auswählen Zahlung erfolgreich! Ihr Konto wird jetzt aktualisiert, bitte warten Sie einen Moment. Vielen Dank für Ihre Unterstützung! - Erfolgreich gespendet! - Ihre Unterstützung ist unerlässlich, um ProtonMail am Laufen zu halten. Vielen Dank für die Unterstützung des Datenschutzes im Internet! Kostenloses Konto erstellen %d GB Speicherplatz %d MB Speicherplatz diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ebc34dff9..8556dac48 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -385,24 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Αποσύνδεση %s; Είστε βέβαιοι ότι θέλετε να αποσυνδεθείτε; Θα μεταβείτε στο %s. - Αναβάθμιση/Δωρεά Το ProtonMail είναι δωρεάν και ανοιχτού κώδικα (open source) Χρειαζόμαστε την υποστήριξή σας για να συνεχίσουμε να προστατεύουμε το απόρρητο και να βελτιώσουμε το ProtonMail - Κάντε Δωρεά Αναβαθμίστε σε ProtonMail Plus - Η δωρεά σας θα μας βοηθήσει να προσθέσουμε - και να συνεχίσουμε την ανάπτυξη του ProtonMail ως λογισμικό ελεύθερου και ανοικτού κώδικα. Είναι δυνατό μόνο μέσω της - υποστήριξης απο την κοινότητα για να είμαστε σε θέση να συνεχίσουμε να παρέχουμε ProtonMail σε ανθρώπους από όλο - τον κόσμο. - Αναβάθμιση/Δωρεά - Επιλέξτε ένα ποσό δωρεάς ή εισάγετε ένα οποιοδήποτε ποσό - 5€ - 15€ - 50€ - 100€ - Εισάγετε ποσό δωρεάς - Δωρεά - Δωρεά μέσω PayPal ή Bitcoin Όλα περιλαμβάνονται στο δωρεάν πακέτο μας 5 GB Αποθηκευτικός Χώρος Χρησιμοποιήστε το δικό σας Domain @@ -469,8 +454,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Παρακαλούμε επιλέξτε έναν τρόπο πληρωμής Επιτυχής πληρωμή! Αναβαθμίζουμε τον λογαριασμό σας, παρακαλώ περιμένετε λίγο. Σας ευχαριστούμε για την υποστήριξή! - Επιτυχία δωρεάς! - Η υποστήριξή σας είναι απαραίτητη για τη λειτουργία του ProtonMail. Σας ευχαριστούμε για την υποστήριξη της ιδιωτικότητας στο διαδίκτυο! Δημιουργία δωρεάν λογαριασμού %d GB αποθηκευτικός χώρος %d MB αποθηκευτικός χώρος diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 89bae467c..454b6fc1f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -385,24 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. ¿Cerrar sesión %s? ¿Seguro que quiere cerrar la sesión? ¿Está seguro que desea cerrar sesión de la cuenta actual y continuar usando %s? - Mejorar/Donar ProtonMail es gratuito y de código abierto Necesitamos su apoyo para continuar protegiendo la privacidad y mejorar ProtonMail - Donar Mejorar a ProtonMail Plus - Su donación nos ayudará a añadir -     capacidad y seguir desarrollando ProtonMail como software libre y de código abierto. Sólo mediante el -     apoyo de la comunidad somos capaces de continuar proporcionando ProtonMail a la gente alrededor -     del mundo. - Mejorar/Donar - Seleccione un monto de donación o ingrese cualquier monto - 5€ - 15€ - 50€ - 100€ - Ingrese el monto de la donación - Donar - Donar mediante PayPal o Bitcoin Todo lo incluido en nuestro plan Gratuito 5 GB de almacenamiento Use su propio dominio @@ -469,8 +454,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Seleccione el tipo de pago ¡Pago exitoso! Estamos mejorando tu cuenta, por favor espera un momento. ¡Gracias por tu apoyo! - ¡Donación exitosa! - Su apoyo es esencial para mantener funcionando a ProtonMail. ¡Gracias por apoyar la privacidad en internet! Crear cuenta gratuita %d GB de almacenamiento %d MB de almacenamiento diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 09179b025..311e45874 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -385,24 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Déconnecter %s ? Êtes-vous sûr de vouloir vous déconnecter ? Vous passerez à %s. - Abonnement / Don ProtonMail est gratuit et open source Nous avons besoin de votre soutien pour continuer à protéger la vie privée et améliorer ProtonMail - Faire un don Passer à ProtonMail Plus - Votre don nous aidera à augmenter - la capacité de ProtonMail et à poursuivre son développement en tant que logiciel gratuit et open source. C\'est uniquement grâce - au soutien de la communauté que nous sommes en mesure de continuer à fournir ProtonMail aux personnes - du monde entier. - Abonnement / Don - Sélectionnez le montant du don ou saisissez n\'importe quel autre montant - 5 € - 15 € - 50 € - 100 € - Saisissez le montant du don - Faire un don - Faire un don via PayPal ou Bitcoin Tout ce qui est inclus dans notre offre Free 5 Go d\'espace de stockage Utilisez votre propre nom de domaine @@ -469,8 +454,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Veuillez sélectionner un mode de paiement Paiement réussi ! Nous mettons à jour votre compte, veuillez patienter un instant. Merci pour votre soutien ! - Don réussi ! - Votre soutien est essentiel au bon fonctionnement de ProtonMail. Merci de nous aider dans notre combat pour la protection de la vie privée sur Internet ! Créer un compte gratuit %d Go de stockage %d Mo de stockage diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 0d03ddd20..1e2d0c96b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -392,24 +392,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Odjavi %s? Jesi li siguran da se želiš odjaviti? Biti će te prebačeni na %s. - Nadogradite/Donirajte ProtonMail je besplatan i otvorenog kôda Potrebna nam je vaša podrška kako bismo nastavili štititi privatnost i poboljšavali ProtonMail - Donirajte Nadogradite na ProtonMail Plus - Vaša donacija će nam pomoći - u povećanju kapaciteta i nastavku razvoja ProtonMaila kao besplatni softver otvorenog koda. Samo uz - podršku zajednice možemo nastaviti pružati ProtonMail ljudima - širom svijeta. - Nadogradite/Donirajte - Odaberite iznos donacije ili unesite bilo koji iznos - 5€ - 15€ - 50€ - 100€ - Unesite iznos donacije - Donirajte - Donirajte putem PayPala ili Bitcoina Sve uključeno u naš Free plan 5 GB prostora za pohranu Koristite vlastitu domenu @@ -476,8 +461,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Odaberite način plaćanja Plaćanje je uspješno! Sada nadograđujemo vaš račun, pričekajte trenutak. Hvala na podršci! - Donacija je uspješna! - Vaša podrška je neophodna za održavanje ProtonMaila. Hvala na podržavanju internetske privatnosti! Izrada besplatnog računa %d GB prostora za pohranu %d MB prostora za pohranu diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index a7385864e..6d74bfc0a 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -386,21 +386,9 @@ Svájci székhellyel Kijelentkezés %s? Biztos, hogy ki szeretne jelentkezni? Biztos benne, hogy kijelentkezik az aktuális fiókból és a következőt használja: %s? - Csomagváltás/Adományozás A ProtonMail ingyenes és nyílt forráskódú Szükségünk van a támogatására, hogy tovább dolgozhassunk a személyes adatok védelméért és fejleszthessük a ProtonMailt - Adományozás Váltás ProtonVPN Plus csomagra - Adománya segít abban, hogy kapacitásunkat növelhessük, és a ProtonMail továbbra is egy ingyenes és nyílt forráskódú szoftver maradhasson. Csak a közösség támogatása teszi lehetővé, hogy a ProtonMail szolgáltatásait az emberek bárhol a világon igénybe vehessék. - Csomagváltás/Adományozás - Válasszon egy összeget vagy írjon be egy tetszőleges értéket - 5€ - 15€ - 50€ - 100€ - Írja be az adomány összegét - Adományozás - Adományozás PayPal vagy Bitcoin fizetéssel Minden ami az ingyenes csomagban is elérhető 5 GB tárhely Saját domain név használata @@ -467,8 +455,6 @@ Svájci székhellyel Kérem, válassza ki a fizetési módot Sikeres fizetés! Most frissítjük fiókját, kérjük várjon egy percet. Köszönjük a támogatást! - Sikeres adományozás! - A támogatása elengedhetetlen, hogy a ProtonMail működhessen. Köszönjük, hogy támogatja a személyes adatok védelmét az interneten! Ingyenes fiók létrehozása %d GB tárhely %d MB tárhely diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 29c4a69c3..0e53a0efa 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -379,24 +379,8 @@ ke:<br/><br/><u>%s</u><br/><br/>Apakah Anda Keluar %s? Yakin ingin keluar? Anda akan pindah ke %s. - Tingkatkan/Donasi ProtonMail gratis dan open source Kami membutuhkan dukungan Anda untuk terus melindungi privasi dan meningkatkan ProtonMail - Donasi - Tingkatkan ke ProtonMail Plus - Sumbangan Anda akan membantu kami menambah - kapasitas dan terus mengembangkan ProtonMail sebagai perangkat lunak bebas dan open source. Hanya dengan - dukungan komunitas, kami dapat terus menyediakan ProtonMail kepada orang-orang di - seluruh dunia. - Tingkatkan/Donasi - Pilih jumlah donasi atau masukkan jumlah berapapun - 5€ - 15€ - 50€ - 100€ - Masukkan jumlah donasi - Donasi - Donasi via PayPal atau Bitcoin Semuanya disertakan dalam paket Gratis kami Penyimpanan 5 GB Gunakan domain Anda sendiri @@ -463,8 +447,6 @@ ke:<br/><br/><u>%s</u><br/><br/>Apakah Anda Pilih metode pembayaran Pembayaran Berhasil! Kami sekarang meningkatkan akun Anda, mohon tunggu sebentar. Terima kasih atas dukungan Anda! - Sumbangan terkirim! - Dukungan Anda memastikan ProtonMail terus ada. Terima kasih sudah mendukung privasi Internet! Buat akun gratis Penyimpanan %d GB Penyimpanan %d MB diff --git a/app/src/main/res/values-is-rIS/strings.xml b/app/src/main/res/values-is-rIS/strings.xml index 55ee1818a..e594067c6 100644 --- a/app/src/main/res/values-is-rIS/strings.xml +++ b/app/src/main/res/values-is-rIS/strings.xml @@ -385,24 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Skrá út %s? Ertu viss að þú viljir skrá þig út? Þér mun verða skipt yfir á %s. - Uppfæra/Styrkja ProtonMail er frjálst, ókeypis og með opinn grunnkóða Við þurfum stuðning þinn til halda áfram að verja friðhelgi fólks og að bæta ProtonMail - Styrkja Uppfæra í ProtonMail Plus - Styrkurinn frá þér mun hjálpa okkur að bæta við - nýjum eiginleikum og halda áfram þróun ProtonMail sem frjáls og opins hugbúnaðar. - Það er einungis með hjálp samfélagsins sem við getum haldið áfram að bjóða ProtonMail - til fólks um víða veröld. - Uppfæra/Styrkja - Veldu upphæð styrks eða settu inn einhverja upphæð - 5€ - 15€ - 50€ - 100€ - Settu inn upphæð styrks - Styrkja - Styrkja með PayPal eða Bitcoin Allt sem er innifalið í ókeypis áskriftarleiðinni 5 GB geymslurými Notaðu þitt eigið lén @@ -470,8 +455,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Veldu gerð greiðslu Greiðsla tókst! Við erum að uppfæra aðganginn þinn, hinkraðu aðeins. Þakka þér fyrir stuðninginn! - Greiðsla styrks tókst! - Stuðningur þinn er undirstaða áframhaldandi þróunar ProtonMail. Þakka þér kærlega fyrir að styðja gagnaleynd á netinu! Búa til ókeypis notandaaðgang %d GB geymslurými %d MB geymslurými diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 352a970a9..32fa7d1db 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -385,24 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Uscire %s? È sicuro di voler uscire? Sei sicuro di voler uscire con l\'account corrente e procedere utilizzando %s? - Effettua l\'upgrade/Dona ProtonMail è gratuito e open source Abbiamo bisogno del tuo sostegno per continuare a proteggere la privacy e migliorare ProtonMail - Dona Effettuare l\'upgrade a ProtonMail Plus - La sua donazione ci aiuterà ad aggiungere - funzioni e a continuare lo sviluppo di ProtonMail come software libero ed open source. Solo tramite il - sostegno della comunità riusciremo a rendere disponibile ProtonMail alle persone di tutto - il mondo. - Effettua l\'upgrade/Dona - Seleziona un importo della donazione o inserisci un qualsiasi importo - 5€ - 15€ - 50€ - 100€ - Inserisca l\'importo della donazione - Dona - Dona via PayPal o Bitcoin Tutto incluso nel nostro piano gratuito 5 GB di spazio Utilizza il tuo dominio @@ -469,8 +454,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Per favore seleziona il tipo di pagamento Pagamento riuscito! Stiamo aggiornando il tuo account, attendi un attimo. Grazie per il tuo supporto! - Donazione riuscita! - Il tuo sostegno è essenziale per mantenere ProtonMail funzionante. Grazie per il tuo supporto alla privacy in internet! Crea un account gratuito %d GB di spazio %d MB di spazio diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e9b700c62..134ef2999 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -376,21 +376,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. %s からログアウトしてよろしいですか？ 本当にログアウトしてよろしいですか？ 現在のアカウントでログアウトして、％s を使用して続行してよろしいですか？ - アップグレード/寄付 ProtonMailはフリーでオープンソースです。 プライバシーを保護しProtonMailを改良し続けるために、私たちはあなたのご支援を必要としています。 - 寄付 ProtonMail Plusプランにアップグレードする - あなたの寄付は、フリーのオープンソースソフトウェアとしてProtonMailの開発を続けることに役立てられます。私たちが世界中の人々にProtonMailのサービスを提供し続けることができるのは、コミュニティのご支援があってこそなのです。 - アップグレード/寄付 - 寄付金額の選択または、任意の金額を入力してください。 - 5 € - 15 € - 50 € - 100 € - 寄付金額を入力してください - 寄付 - ビットコインまたはPayPal経由で寄付します。 無料のプランに含まれるものすべて 5 GB のストレージ 独自ドメインの利用 @@ -454,9 +442,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. 支払い方法を選択してください。 支払いが正常に完了しました。 アカウントをアップグレードしていますので、しばらくお待ちください。ご支援くださり、ありがとうございます。 - 寄付が完了しました。 - 私たちがProtonMailの開発を続けるためには、あなたの支援が不可欠です。インターネット上でのプライバシー保護のために支援していただきありがとうございます。 - 無料アカウントを作成する %d GBのストレージ %d MBのストレージ 最大 %d 個の別名メールアドレス diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 8e15b8f12..5768fe149 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -383,21 +383,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Log out %s? Tebɣiḍ ad teffɣeḍ? Are you sure you want to logout with current account and proceed using %s? - Sali aswir/Mudd tawsa ProtonMail is free and open source We need your support to continue protecting privacy and improving ProtonMail - Mudd tawsa Ali ar ProtonMail Plus - Tawsa-ik ad ɣ-d-mudd afus ad nessali tazmert udiɣ ad nkemmel ad nesnefli ProtonMail akken ad yeqqim d aseɣzan ilelli d aɣbalu yeldin. S useqdec neɣ tallelt n tmezdagnut-nneɣ, ad nizmir ad nkemmel asuffeɣ n ProtonMail ar umaḍal meṛṛa. - Leqqem/Tawsa - Fren tallayt n tewsa neɣ sekcem tallyt tebɣiḍ - 5€ - 15€ - 50€ - 100€ - Sekcem tallayt n tewsa - Mudd tawsa - Mudd s PayPal neɣ Bitcoin Tal taɣawsa tella di tikci-nneɣ n baṭel 5 GAṬ n usekles Seqdec taɣult-ik @@ -463,8 +451,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Ttxil-k fren anaw n uxelleṣ Axelleṣ yedda akken iwata! We are now upgrading your account, please wait a moment. Thank you for your support! - Tikci tedda akken iwata! - Your support is essential to keeping ProtonMail running. Thank you for supporting internet privacy! Snulfu-d amiḍan baṭel %d GAṬ n usekles %d Maṭ n usekles diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e7e618b36..26e4e3534 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -385,21 +385,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. %s uitloggen? Weet u zeker dat u wilt uitloggen? Weet u zeker dat u wilt uitloggen met huidige account en verder wilt gaan met %s? - Upgrade/doneren ProtonMail is gratis en open source We hebben uw steun nodig voor het blijven beschermen van privacy en het verbeteren van ProtonMail - Doneren Upgrade naar ProtonMail Plus - Uw donatie helpt ons bij het uitbreiden van de capaciteit en om door te gaan met het ontwikkelen van ProtonMail als vrije en open source software. Alleen dankzij de steun die wij krijgen van de gemeenschap zijn wij in staat om door te gaan met het beschikbaar stellen van ProtonMail aan mensen over de hele wereld. - Upgrade/Doneren - Selecteer een bedrag of voer een bedrag in - € 5,- - € 15,- - € 50,- - € 100,- - Voer een te doneren bedrag in - Doneren - Doneren via PayPal of Bitcoin Alles van ons gratis plan 5 GB opslagruimte Gebruik uw eigen domein @@ -464,8 +452,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Selecteer een betaalwijze Betaling succesvol! We zijn nu bezig met het upgraden van uw account, even geduld alstublieft. Bedankt voor uw steun! - Donatie gelukt! - Uw steun is essentieel om ProtonMail te laten voortbestaan. Bedankt voor het steunen van privacy op internet! Maak een gratis account aan %d GB opslagruimte %d MB opslagruimte diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ec31ae43b..98b07a963 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -399,24 +399,9 @@ zresetować hasło logowania, jeśli je zapomnisz. Wylogować się z konta %s? Czy na pewno chcesz się wylogować? Zostaniesz przełączony na konto %s. - Ulepsz konto/Wspomóż nas ProtonMail jest darmowym i otwartym oprogramowaniem Potrzebujemy Twojego wsparcia, aby móc chronić prywatność i udoskonalać ProtonMaila - Wspomóż nas Ulepsz do planu ProtonMail Plus - Twoja darowizna pozwoli nam zwiększyć - przestrzeń dyskową oraz rozwijać ProtonMaila jako darmowe i otwarte oprogramowanie. - Tylko dzięki wsparciu społeczności, możemy w dalszym ciągu dostarczać ProtonMaila - ludziom na całym świecie. - Ulepsz konto/Wspomóż nas - Wybierz kwotę darowizny lub wpisz dowolną kwotę - 5€ - 15€ - 50€ - 100€ - Wpisz kwotę darowizny - Wspomóż nas - Darowizna przez PayPal lub Bitcoin Wszystko zawarte w naszym planie Free 5 GB przestrzeni dyskowej Korzystaj z własnej domeny @@ -480,8 +465,6 @@ zresetować hasło logowania, jeśli je zapomnisz. Wybierz typ płatności Zapłacono pomyślnie! Ulepszamy teraz Twoje konto, poczekaj chwilę. Dziękujemy za Twoje wsparcie! - Darowizna została przekazana! - Twoja pomoc jest niezbędna do funkcjonowania poczty ProtonMail. Dziękujemy za wsparcie prywatności w Internecie! Utwórz darmowe konto %d GB przestrzeni dyskowej %d MB przestrzeni dyskowej diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 05af5e602..3e42963c3 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -385,24 +385,9 @@ redefina sua senha caso você necessite. Encerrar sessão %s? Você tem certeza que deseja encerrar a sessão? Você tem certeza que deseja encerrar a sessão da conta atual e continuar usando %s? - Upgrade/Doar ProtonMail é gratuito e de código aberto Precisamos de seu apoio para continuar protegendo a privacidade e aprimorar o ProtonMail - Doar Upgrade para o ProtonMail Plus - Sua doação nos ajudará a adicionar - capacidade e continuar a desenvolver o ProtonMail como um software gratuito e de código aberto. É apenas através do - suporte da comunidade que podemos continuar fornecendo o serviço do ProtonMail para as pessoas - em todo o mundo. - Upgrade/Doar - Escolha um valor para doação ou digite a quantia desejada - 5€ - 15€ - 50€ - 100€ - Digite o valor para doação - Doar - Doar através de PayPal ou Bitcoin Tudo incluso em nosso plano gratuito 5 GB de Armazenamento Use seu próprio domínio @@ -469,8 +454,6 @@ redefina sua senha caso você necessite. Por favor, selecione o tipo de pagamento Pagamento efetuado com sucesso! Agora estamos atualizando sua conta! Por favor, aguarde um momento. Obrigado pelo seu apoio! - Doação efetuada com sucesso! - Seu suporte é essencial para manter a ProtonMail em execução. Obrigado por apoiar a privacidade na internet! Criar conta gratuita %d GB de armazenamento %d MB de armazenamento diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 0cae8a245..26171f8ba 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -384,24 +384,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Terminar sessão em %s? Tem certeza de que deseja encerrar a sessão? Será mudado para %s. - Actualizar/Doar O ProtonMail é gratuito e de código aberto Precisamos do seu apoio para continuar a proteger a privacidade e melhorar o ProtonMail - Doar Actualize para o ProtonMail Plus - O seu donativo ajudar-nos-á a aumentar - a capacidade e continuar a desenvolver o ProtonMail como programa livre e de código aberto. É apenas através do - apoio da comunidade que conseguimos continuar a oferecer o ProtonMail a pessoas em todo - o mundo. - Actualizar/Doar - Seleccione um montante para o donativo ou insira qualquer montante - 5€ - 15€ - 50€ - 100€ - Insira o montante do donativo - Doar - Doar via PayPal ou Bitcoin Tudo incluído no nosso plano Free 5 GB de armazenamento Utilize o seu próprio domínio @@ -468,8 +453,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Por favor, seleccione o tipo de pagamento Pagamento com sucesso! Estamos a actualizar a sua conta, por favor aguarde um momento. Obrigado por seu apoio! - Doação com sucesso! - A sua ajuda é essencial para manter o ProtonMail em funcionamento. Obrigado por suportar a privacidade na Internet! Criar uma conta gratuita %d GB de armazenamento %d MB de armazenamento diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b23003b29..71db70521 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -391,23 +391,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Deconectare %s? Sigur doriţi să vă deconectați? Veți fi comutat la %s. - Upgrade/Donare ProtonMail este gratuit și cu cod sursă public Avem nevoie de susținerea dvs. pentru continuarea protejării intimității și îmbunătățirii ProtonMail - Donați Upgrade la ProtonMail Plus - Prin donația dvs. ne veți ajuta să - ne mărim capacitatea și să continuăm dezvoltarea ProtonMail, gratuit și cu cod sursă public. - Doar cu susținerea comunității putem continua să oferim ProtonMail tuturor oamenilor. - Upgrade/Donare - Selectați suma donată sau introduceți orice sumă - 5 € - 15 € - 50 € - 100 € - Introduceți suma donată - Donați - Donați prin PayPal sau Bitcoin Tot ce este inclus în planul Gratuit 5 GB de spațiu Folosiți domeniul propriu @@ -474,8 +460,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Selectați metoda de plată Plată reușită! Se îmbunătățește contul, așteptați puțin. Vă mulțumim pentru suport! - Donație reușită! - Suportul dvs. este esențial pentru a păstra funcționarea ProtonMail. Vă mulțumim pentru sprijinirea confidențialității Internetului! Creare cont gratuit %d GB spațiu %d MB spațiu diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 825149ba3..d7ba6fafd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -399,24 +399,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Выйти из %s? Вы уверены, что хотите выйти? Вы будете переключены на %s. - Повысить/Пожертвовать ProtonMail свободный и с открытым исходным кодом Нам нужна ваша поддержка для продолжения защиты конфиденциальности и развития ProtonMail - Пожертвовать Повысить до ProtonMail Plus - Ваше пожертвование поможет нам увеличить - вместимость и продолжать разработку ProtonMail как свободного ПО с открытым исходным кодом. Только благодаря - поддержке сообщества мы можем продолжать предоставлять доступ к ProtonMail людям со всего - мира. - Повысить/Пожертвовать - Выберите размер пожертвования или введите любую сумму - 5€ - 15€ - 50€ - 100€ - Введите сумму пожертвования - Пожертвовать - Пожертвовать через PayPal или Bitcoin Всё, что включено в наш Бесплатный тариф 5 ГБ хранилища Используйте свой домен @@ -483,8 +468,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Пожалуйста, выберите тип оплаты Платёж выполнен успешно! Сейчас мы расширяем вашу учётную запись, подождите немного, пожалуйста. Благодарим вас за поддержку! - Пожертвование успешно! - Ваша поддержка крайне важна для продолжения работы ProtonMail. Благодарим за поддержку конфиденциальности в Интернете! Создать бесплатную учётную запись %d ГБ хранилища %d МБ хранилища diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index b709a9bbe..c4ec24e32 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -383,24 +383,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Log out %s? Är du säker på att du vill logga ut? Är du säker på att du vill logga ut med nuvarande konto och fortsätta med %s? - Uppgradera/donera ProtonMail är gratis och open-source Vi behöver ditt stöd för att fortsätta skydda integriteten och förbättra ProtonMail - Donera Uppgradera till ProtonMail Plus - Din donation hjälper oss att - utöka kapacitet och fortsätta att utveckla ProtonMail som fri och öppen källkodsprogramvara. Det är - endast genom communitys stöd vi kan fortsätta tillhandahålla ProtonMail till människor runt om i - världen. - Uppgradera/donera - Välj belopp att donera eller ange valfritt belopp - 5€ - 15€ - 50€ - 100€ - Ange belopp att donera - Donera - Donera via PayPal eller Bitcoin Allt som ingår i gratis-planen 5 GB lagring Använd din egen domän @@ -465,8 +450,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Vänligen välj betalnings metod Betalningen lyckades! Kontot håller på att uppgraderas, vänligen vänta. Tack för din förståelse! - Donation lyckades! - Ditt stöd är mycket viktigt att hålla ProtonMail igång. Tack för att du stödjer internetsekretess! Skapa ett gratiskonto %d GB lagringsutrymme %d MB lagringsutrymme diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8d5887589..7d1841eac 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -383,21 +383,9 @@ Bu şifreyi kaybetmeyin, kurtaramayız. Şifrenizi kaybederseniz, e-postaların Log out %s? Oturumu kapatmak istediğinden emin misiniz? Geçerli hesap oturumunu kapatmak ve %s kullanarak devam etmek istediğinizden emin misiniz? - Yükseltme/Bağış ProtonMail ücretsiz ve açık kaynaklıdır Gizliliğinizin korunmasına ve ProtonMail\'i geliştirmeye devam etmemiz için desteğinize ihtiyacımız var - Bağış Yap ProtonMail Plus\'a Yükselt - Bağışınız, kapasite eklememize ve ücretsiz ve açık kaynaklı yazılım olarak ProtonMail\'i geliştirmeye devam etmemize yardımcı olacak. ProtonMail\'i dünyadaki insanlara sunmaya devam edebilmemiz yalnızca topluluğun desteği ile gerçekleşir. - Yükseltme/Bağış - Bağış tutarını seçin veya herhangi bir tutar girin - 5€ - 15€ - 50€ - 100€ - Bağış miktarı girin - Bağış Yap - PayPal veya Bitcoin ile Bağış Yap Ücretsiz planımıza dahil olan her şey 5 GB Depolama alanı Kendi etki alanınızı kullanın @@ -462,8 +450,6 @@ Bu şifreyi kaybetmeyin, kurtaramayız. Şifrenizi kaybederseniz, e-postaların Lütfen ödeme türünü seçin Ödeme başarılı! Şimdi hesabınızı yükseltiyoruz. Lütfen biraz bekleyin. Desteğiniz için teşekkürler! - Bağış başarılı! - ProtonMail\'i çalışır tutmak için desteğiniz gereklidir. İnternet gizliliğini desteklediğiniz için teşekkür ederiz! Ücretsiz bir hesap oluşturun %d GB depolama %d MB depolama diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e53240b15..60b3963c2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -399,21 +399,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Вийти з %s? Впевнені, що хочете вийти? Вас буде перемкнуто на %s. - Оновлення/пожертвувати ProtonMail є бесплатний і має відкритий вихідний код Ми потребуємо Вашої підримки щоб продовжувати захищати конфіденційність та покращувати ProtonMail - Пожертва Підвищітись до ProtonMail Plus - Ваш внесок допоможе нам збільшити спроможності ProtonMail-а та продовжити розвивати його як вільний програмний продукт з відкритим початковим кодом. Лише завдяки підтримці спільноті ми можемо продовжувати надавати ProtonMail людям у всьому світі. - Оновлення/пожертвувати - Виберіть суму пожертви або введіть будь-яку суму - 5€ - 15€ - 50€ - 100€ - Вкажіть суму пожертви - Пожертва - Пожертва через PayPal чи Bitcoin Все включене в наш вільний план 5 ГБ сховища Використовуйте свій власний домен @@ -480,8 +468,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Будь ласка, виберіть спосіб оплати Успішно сплачено! Ми оновлюємо ваш обліковий запис, будь ласка, зачекайте хвилинку. Дякуємо за вашу підтримку! - Допомогу надіслано! - Ваша допомога має важливе значення для продовження роботи ProtonMail. Дякуємо за підтримку приватності Інтернету! Створити безплатний обліковий запис %d ГБ сховища %d МБ сховища diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 50058f736..18d17a708 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -375,21 +375,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. 退出账户 %s？ 确定要退出账户吗？ 确定退出当前账户并转到 %s 吗？ - 升级/捐款 ProtonMail 免费且开源 我们需要您的支持来继续改进 ProtonMail，推动隐私保护。 - 捐款 开通 ProtonMail 增强版 - 您的捐款能够帮助我们扩充服务器，并继续开发免费开源的 ProtonMail 软件。只有依靠整个社群的支持，我们才能继续向全世界提供 ProtonMail 服务。 - 升级/捐款 - 选择捐款金额或直接输入 - €5 - €15 - €50 - €100 - 输入捐款金额 - 捐款 - 使用 PayPal 或比特币捐款 包含免费版的所有功能 5 GB 存储空间 可使用您自己的域名 @@ -453,8 +441,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. 请选择支付方式 支付成功！ 我们正在为您升级账户，请稍等片刻。感谢您的支持！ - 捐款完成！ - 您的支持对于 ProtonMail 至关重要。感谢您支持互联网隐私保护！ 创建免费账户 %d GB 存储空间 %d MB 存储空间 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 02c6daa22..b378131ea 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -378,25 +378,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. 登出 %s？ 您確定要登出嗎？ 您將切換為 %s。 - 升級／捐款 ProtonMail 免費自由，並開放原始碼 我們需要您的支持，以繼續保護隱私並改進 ProtonMail - 捐款 升級至 ProtonMail Plus - 您的捐款可以協助我們成長， - 並繼續開發免費自由且開放原始碼的 ProtonMail。 - 感謝社群的支持，我們才得以持續向世界各地的人們 - 提供 ProtonMail 服務。 - 升級／捐款 - 選取捐款金額或輸入任何金額 - 5€ - 15€ - 50€ - 100€ - 輸入捐款金額 - 捐款 - 透過 PayPal 或比特幣捐款 - 我們的免費方案包含的所有功能 5 GB 儲存空間 使用自訂域名 最多 5 個電子郵件別名 @@ -462,8 +446,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. 請選擇付款類型 付款成功！ 我們目前正在升級您的帳號，請稍候。感謝您的支持！ - 捐款成功！ - 您的支持是讓 ProtonMail 得以繼續運作的關鍵。感謝您對網路隱私的支持！ 建立免費帳號 %d GB 儲存空間 %d MB 儲存空間 diff --git a/app/src/main/res/values/links.xml b/app/src/main/res/values/links.xml index f13283735..690079f16 100644 --- a/app/src/main/res/values/links.xml +++ b/app/src/main/res/values/links.xml @@ -20,7 +20,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. https://protonmail.com/upgrade https://protonmail.com/support/knowledge-base/encrypt-for-outside-users/ - https://protonmail.com/donate https://mail.protonmail.com/help/reset-login-password https://protonmail.com/support/knowledge-base/encrypted-contacts/ https://protonmail.com/support/knowledge-base/increase-my-storage-space/ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55ce5457f..910944c6c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -408,24 +408,9 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Log out %s? Are you sure you want to log out? You will be switched to %s. - Upgrade/Donate ProtonMail is free and open source We need your support to continue protecting privacy and improving ProtonMail - Donate Upgrade to ProtonMail Plus - Your donation will help us add - capacity and continue to develop ProtonMail as free and open source software. It is only through the - support of the community that we are able to continue providing ProtonMail to people around - the world. - Upgrade/Donate - Select a donation amount or enter any amount - 5€ - 15€ - 50€ - 100€ - Enter donation amount - Donate - Donate via PayPal or Bitcoin Everything included in our Free plan 5 GB Storage @@ -499,8 +484,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/. Please select payment type Payment Success! We are now upgrading your account, please wait a moment. Thank you for your support! - Donation Success! - Your support is essential to keeping ProtonMail running. Thank you for supporting internet privacy! Create free account %d GB storage diff --git a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/menu/MenuRobot.kt b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/menu/MenuRobot.kt index b197f73db..33aa486e7 100644 --- a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/menu/MenuRobot.kt +++ b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/menu/MenuRobot.kt @@ -181,7 +181,7 @@ class MenuRobot { val settingsText = stringFromResource(R.string.settings) val contactsText = stringFromResource(R.string.contacts) val reportBugsText = stringFromResource(R.string.report_bugs) - val upgradeDonateText = stringFromResource(R.string.upgrade_donate) + val upgradeDonateText = stringFromResource(R.string.upgrade) val draftsText = stringFromResource(R.string.drafts) val sentText = stringFromResource(R.string.sent) val logoutText = stringFromResource(R.string.logout) diff --git a/buildSrc/src/main/kotlin/ProtonMail.kt b/buildSrc/src/main/kotlin/ProtonMail.kt index 8850a20ac..1b3e5e841 100644 --- a/buildSrc/src/main/kotlin/ProtonMail.kt +++ b/buildSrc/src/main/kotlin/ProtonMail.kt @@ -22,8 +22,8 @@ * @author Davide Farella */ object ProtonMail { - const val versionName = "1.13.29" - const val versionCode = 766 + const val versionName = "1.13.30" + const val versionCode = 769 const val targetSdk = 30 const val minSdk = 21 diff --git a/buildSrc/src/main/kotlin/libraries.kt b/buildSrc/src/main/kotlin/libraries.kt index 0645c163e..a6467fd4d 100644 --- a/buildSrc/src/main/kotlin/libraries.kt +++ b/buildSrc/src/main/kotlin/libraries.kt @@ -58,6 +58,7 @@ fun DependencyHandler.playServices(moduleSuffix: String, version: String = `play // endregion // region Test +val DependencyHandler.`assert4k` get() = forface(module = "assert4k-jvm") version `assert4k version` val DependencyHandler.`assertJ` get() = dependency("org.assertj", module = "assertj-core") version `assertJ version` val DependencyHandler.`hamcrest` get() = dependency("org.hamcrest", module = "hamcrest-library") version `hamcrest version` // endregion diff --git a/buildSrc/src/main/kotlin/repositories.kt b/buildSrc/src/main/kotlin/repositories.kt index 37b15af16..40832fca1 100644 --- a/buildSrc/src/main/kotlin/repositories.kt +++ b/buildSrc/src/main/kotlin/repositories.kt @@ -1,18 +1,18 @@ /* * Copyright (c) 2020 Proton Technologies AG - * + * * This file is part of ProtonMail. - * + * * ProtonMail is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * ProtonMail is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with ProtonMail. If not, see https://www.gnu.org/licenses/. */ @@ -25,10 +25,6 @@ import org.gradle.kotlin.dsl.maven */ val repos: RepositoryHandler.() -> Unit get() = { google() - maven("https://dl.bintray.com/kotlin/kotlinx/") jcenter() - // Proton Core libraries - maven("https://dl.bintray.com/proton/Core-publishing") - // Assert4k - maven("https://dl.bintray.com/4face/4face") + maven("https://dl.bintray.com/kotlin/kotlinx/") } diff --git a/buildSrc/src/main/kotlin/versionsConfig.kt b/buildSrc/src/main/kotlin/versionsConfig.kt index 7924d8b29..bff295ae8 100644 --- a/buildSrc/src/main/kotlin/versionsConfig.kt +++ b/buildSrc/src/main/kotlin/versionsConfig.kt @@ -50,7 +50,7 @@ fun initVersions() { // endregion // region Others - `assert4k version` = "0.5.7" // Released: Aug 15, 2020 + `assert4k version` = "0.7.1" // Released: May 04, 2021 `assistedInject version` = "0.6.0" // Released: Sep 14, 2020 `dagger version` = "2.28.3" // Released: Jul 18, 2020 diff --git a/config/detekt/config.yml b/config/detekt/config.yml index 6f252dbc5..3f1e79d98 100644 --- a/config/detekt/config.yml +++ b/config/detekt/config.yml @@ -644,7 +644,7 @@ style: maxJumpCount: 2 MagicNumber: active: true - excludes: ['**/test/**', '**/**Test/**', '**/gradle/**', '**/buildSrc/**'] + excludes: ['**/test/**', '**/**Test/**', '**/gradle/**', '**/buildSrc/**', '**/*.kts'] ignoreNumbers: ['-1', '0', '1', '2'] ignoreHashCodeFunction: true ignorePropertyDeclaration: true