From 04764eb989497c44d529fe8af9952ce42db8deec Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 9 May 2020 11:41:45 +0200 Subject: [PATCH] fix Quicksy build flavor --- .../java/eu/siacs/conversations/ui/VerifyActivity.java | 6 +++--- .../eu/siacs/conversations/ui/util/ApiDialogHelper.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java index f6be2d91f..7dc59845e 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java @@ -25,7 +25,7 @@ import eu.siacs.conversations.ui.util.ApiDialogHelper; import eu.siacs.conversations.ui.util.PinEntryWrapper; import eu.siacs.conversations.utils.AccountUtils; import eu.siacs.conversations.utils.PhoneNumberUtilWrapper; -import eu.siacs.conversations.utils.TimeframeUtils; +import eu.siacs.conversations.utils.TimeFrameUtils; import io.michaelrocks.libphonenumber.android.NumberParseException; import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN; @@ -67,7 +67,7 @@ public class VerifyActivity extends XmppActivity implements ClipboardManager.OnP long remaining = retrySmsAfter - SystemClock.elapsedRealtime(); if (remaining >= 0) { binding.resendSms.setEnabled(false); - binding.resendSms.setText(getString(R.string.resend_sms_in, TimeframeUtils.resolve(VerifyActivity.this, remaining))); + binding.resendSms.setText(getString(R.string.resend_sms_in, TimeFrameUtils.resolve(VerifyActivity.this, remaining))); return true; } } @@ -81,7 +81,7 @@ public class VerifyActivity extends XmppActivity implements ClipboardManager.OnP long remaining = retryVerificationAfter - SystemClock.elapsedRealtime(); if (remaining >= 0) { binding.next.setEnabled(false); - binding.next.setText(getString(R.string.wait_x, TimeframeUtils.resolve(VerifyActivity.this, remaining))); + binding.next.setText(getString(R.string.wait_x, TimeFrameUtils.resolve(VerifyActivity.this, remaining))); return true; } } diff --git a/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java b/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java index 995fe3fca..9bd7b2514 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java @@ -11,7 +11,7 @@ import android.support.annotation.StringRes; import eu.siacs.conversations.R; import eu.siacs.conversations.services.QuickConversationsService; -import eu.siacs.conversations.utils.TimeframeUtils; +import eu.siacs.conversations.utils.TimeFrameUtils; public class ApiDialogHelper { @@ -79,7 +79,7 @@ public class ApiDialogHelper { public static Dialog createRateLimited(final Context context, final long timestamp) { final AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.rate_limited); - builder.setMessage(context.getString(R.string.try_again_in_x, TimeframeUtils.resolve(context, timestamp - SystemClock.elapsedRealtime()))); + builder.setMessage(context.getString(R.string.try_again_in_x, TimeFrameUtils.resolve(context, timestamp - SystemClock.elapsedRealtime()))); builder.setPositiveButton(R.string.ok, null); return builder.create(); }