Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed spelling mistakes #1311

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/org/kontalk/service/DownloadListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/kontalk/sync/SyncProcedure.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public static void enable() {
sDisabled = false;
}

/** Temporarly disable all notifications. */
/** Temporarily disable all notifications. */
public static void disable() {
sDisabled = true;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/kontalk/ui/NumberValidation.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/kontalk/ui/SendIntentReceiver.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down