narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

fix Quicksy build flavor

Browse source
This commit is contained in:
Daniel Gultsch 2020-05-09 11:41:45 +02:00
parent 92fc22b313
commit 04764eb989
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
View file

@ -25,7 +25,7 @@ import eu.siacs.conversations.ui.util.ApiDialogHelper;
import eu.siacs.conversations.ui.util.PinEntryWrapper; import eu.siacs.conversations.ui.util.PinEntryWrapper;
import eu.siacs.conversations.utils.AccountUtils; import eu.siacs.conversations.utils.AccountUtils;
import eu.siacs.conversations.utils.PhoneNumberUtilWrapper; 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 io.michaelrocks.libphonenumber.android.NumberParseException;
import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN; 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(); long remaining = retrySmsAfter - SystemClock.elapsedRealtime();
if (remaining >= 0) { if (remaining >= 0) {
binding.resendSms.setEnabled(false); 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; return true;
} }
} }
@ -81,7 +81,7 @@ public class VerifyActivity extends XmppActivity implements ClipboardManager.OnP
long remaining = retryVerificationAfter - SystemClock.elapsedRealtime(); long remaining = retryVerificationAfter - SystemClock.elapsedRealtime();
if (remaining >= 0) { if (remaining >= 0) {
binding.next.setEnabled(false); 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; return true;
} }
} }

4
src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java
View file

@ -11,7 +11,7 @@ import android.support.annotation.StringRes;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.services.QuickConversationsService; import eu.siacs.conversations.services.QuickConversationsService;
import eu.siacs.conversations.utils.TimeframeUtils; import eu.siacs.conversations.utils.TimeFrameUtils;
public class ApiDialogHelper { public class ApiDialogHelper {
@ -79,7 +79,7 @@ public class ApiDialogHelper {
public static Dialog createRateLimited(final Context context, final long timestamp) { public static Dialog createRateLimited(final Context context, final long timestamp) {
final AlertDialog.Builder builder = new AlertDialog.Builder(context); final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.rate_limited); 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); builder.setPositiveButton(R.string.ok, null);
return builder.create(); return builder.create();
} }