diff --git a/app/src/main/java/org/kontalk/service/DownloadListener.java b/app/src/main/java/org/kontalk/service/DownloadListener.java index 0348a0716..71ba2ca47 100644 --- a/app/src/main/java/org/kontalk/service/DownloadListener.java +++ b/app/src/main/java/org/kontalk/service/DownloadListener.java @@ -47,10 +47,10 @@ public interface DownloadListener { void completed(String url, String mime, File destination); /** - * Called if an error occured while download. + * Called if an error occurred while download. * @param url * @param destination - * @param exc the exception occured + * @param exc the exception occurred */ void error(String url, File destination, Throwable exc); diff --git a/app/src/main/java/org/kontalk/service/msgcenter/MessageCenterService.java b/app/src/main/java/org/kontalk/service/msgcenter/MessageCenterService.java index 905d52e31..e07af5076 100644 --- a/app/src/main/java/org/kontalk/service/msgcenter/MessageCenterService.java +++ b/app/src/main/java/org/kontalk/service/msgcenter/MessageCenterService.java @@ -1045,7 +1045,7 @@ public boolean joinTimeout(long millis) { try { // we must wait for the connection to actually close join(millis); - // this won't send the last sm ack, preventing another interruptable zone + // this won't send the last sm ack, preventing another interruptible zone mConn.suspendSmAck(); interrupt(); return !isAlive(); diff --git a/app/src/main/java/org/kontalk/sync/SyncProcedure.java b/app/src/main/java/org/kontalk/sync/SyncProcedure.java index f579cd165..fc70600cb 100644 --- a/app/src/main/java/org/kontalk/sync/SyncProcedure.java +++ b/app/src/main/java/org/kontalk/sync/SyncProcedure.java @@ -161,9 +161,9 @@ public synchronized void onPresence(PresenceEvent event) { item.presence = true; // increment presence count mPresenceCount++; - // check user existance (only if subscription is "both") + // check user existence (only if subscription is "both") if (!item.matched && event.subscribedFrom && event.subscribedTo) { - // verify actual user existance through last activity + // verify actual user existence through last activity String lastActivityId = StringUtils.randomString(6); requestLastActivity(item.from, lastActivityId); mNotMatched.add(lastActivityId); @@ -246,7 +246,7 @@ public synchronized void onBlocklist(BlocklistEvent event) { } } - /** Last activity (for user existance verification). */ + /** Last activity (for user existence verification). */ @Subscribe(threadMode = ThreadMode.BACKGROUND) public synchronized void onLastActivity(LastActivityEvent event) { if (mNotMatched.contains(event.id)) { diff --git a/app/src/main/java/org/kontalk/ui/AccountAuthenticatorActionBarActivity.java b/app/src/main/java/org/kontalk/ui/AccountAuthenticatorActionBarActivity.java index 3a3dbdfd6..bf115331a 100644 --- a/app/src/main/java/org/kontalk/ui/AccountAuthenticatorActionBarActivity.java +++ b/app/src/main/java/org/kontalk/ui/AccountAuthenticatorActionBarActivity.java @@ -50,7 +50,7 @@ public final void setAccountAuthenticatorResult(Bundle result) { } /** - * Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the + * Retrieves the AccountAuthenticatorResponse from either the intent of the icicle, if the * icicle is non-zero. * @param icicle the save instance data of this Activity, may be null */ diff --git a/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java b/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java index 78f685555..07a68950b 100644 --- a/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java +++ b/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java @@ -402,7 +402,7 @@ protected boolean handleActionViewConversation(Uri uri, Bundle args) { @Override protected void onArgumentsProcessed() { - // non existant thread - check for not synced contact + // non existent thread - check for not synced contact if (getThreadId() <= 0 && mConversation != null && mUserJID != null) { Contact contact = mConversation.getContact(); if ((contact == null || !contact.isRegistered()) && mUserPhone != null) { @@ -774,7 +774,7 @@ void setPrivacy(@NonNull Context ctx, PrivacyCommand action) { return; } - // temporarly disable peer observer because the next call will write to the threads table + // temporarily disable peer observer because the next call will write to the threads table unregisterPeerObserver(); // mark request as pending accepted diff --git a/app/src/main/java/org/kontalk/ui/MessagingNotification.java b/app/src/main/java/org/kontalk/ui/MessagingNotification.java index 6876f468b..000ad2167 100644 --- a/app/src/main/java/org/kontalk/ui/MessagingNotification.java +++ b/app/src/main/java/org/kontalk/ui/MessagingNotification.java @@ -323,7 +323,7 @@ public static void enable() { sDisabled = false; } - /** Temporarly disable all notifications. */ + /** Temporarily disable all notifications. */ public static void disable() { sDisabled = true; } diff --git a/app/src/main/java/org/kontalk/ui/NumberValidation.java b/app/src/main/java/org/kontalk/ui/NumberValidation.java index 631dba2a4..5e02dbe7f 100644 --- a/app/src/main/java/org/kontalk/ui/NumberValidation.java +++ b/app/src/main/java/org/kontalk/ui/NumberValidation.java @@ -981,7 +981,7 @@ public void onInput(@NonNull MaterialDialog dialog, CharSequence input) { @Subscribe(threadMode = ThreadMode.MAIN) public void onRetrieveKeyError(RetrieveKeyError event) { - // FIXME maybe a somewhat more detailed explaination + // FIXME maybe a somewhat more detailed explanation onGenericError(event.exception); } diff --git a/app/src/main/java/org/kontalk/ui/SendIntentReceiver.java b/app/src/main/java/org/kontalk/ui/SendIntentReceiver.java index 97209d114..a68e1ab6f 100644 --- a/app/src/main/java/org/kontalk/ui/SendIntentReceiver.java +++ b/app/src/main/java/org/kontalk/ui/SendIntentReceiver.java @@ -34,7 +34,7 @@ /** - * Static utilities used by activites that can receive ACTION_SEND intents, + * Static utilities used by activities that can receive ACTION_SEND intents, * namely {@link ConversationsActivity} (indirectly) and {@link ComposeMessage}. * Not the best solution, but it was too complicated to be used as parent class. */