Skip to content

Commit f5b1177

Browse files
committed
Android syntax/import fixes
1 parent 34887c6 commit f5b1177

File tree

2 files changed

+32
-28
lines changed

2 files changed

+32
-28
lines changed

android/src/main/java/com/taskrabbit/zendesk/RNZendeskChatModule.java

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.pm.ApplicationInfo;
55
import android.util.Log;
66

7+
import com.facebook.react.bridge.Promise;
78
import com.facebook.react.bridge.ReactApplicationContext;
89
import com.facebook.react.bridge.ReactContext;
910
import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -12,21 +13,24 @@
1213
import com.facebook.react.bridge.ReadableMap;
1314
import com.facebook.react.bridge.ReadableType;
1415
import com.facebook.react.bridge.WritableNativeMap;
16+
17+
import zendesk.chat.Account;
18+
import zendesk.chat.AccountStatus;
1519
import zendesk.chat.Chat;
1620
import zendesk.chat.ChatConfiguration;
21+
import zendesk.chat.ChatEngine;
1722
import zendesk.chat.ChatSessionStatus;
1823
import zendesk.chat.ChatState;
1924
import zendesk.chat.ObservationScope;
2025
import zendesk.chat.Observer;
2126
import zendesk.chat.ProfileProvider;
2227
import zendesk.chat.PreChatFormFieldStatus;
2328
import zendesk.chat.PushNotificationsProvider;
24-
import zendesk.chat.ChatEngine;
25-
import zendesk.chat.PushNotificationsProvider;
2629
import zendesk.chat.VisitorInfo;
27-
import zendesk.chat.AccountStatus;
2830
import zendesk.messaging.MessagingActivity;
2931
import zendesk.messaging.MessagingConfiguration;
32+
import com.zendesk.service.ErrorResponse;
33+
import com.zendesk.service.ZendeskCallback;
3034

3135
import java.lang.String;
3236
import java.util.ArrayList;
@@ -380,28 +384,28 @@ public void update(ChatState chatState) {
380384
});
381385
}
382386

383-
@ReactMethod
384-
public void areAgentsOnline(Promise promise) {
385-
Chat.INSTANCE.providers().accountProvider().getAccount(new ZendeskCallback<Account>() {
386-
@Override
387-
public void onSuccess(Account account) {
388-
AccountStatus status = account.getStatus();
389-
390-
switch (status) {
391-
case AccountStatus.ONLINE:
392-
promise.resolve(true);
393-
break;
394-
395-
default:
396-
promise.resolve(false);
397-
break;
398-
}
399-
}
400-
401-
@Override
402-
public void onError(ErrorResponse errorResponse) {
403-
reject();
404-
}
405-
});
406-
}
387+
@ReactMethod
388+
public void areAgentsOnline(final Promise promise) {
389+
Chat.INSTANCE.providers().accountProvider().getAccount(new ZendeskCallback<Account>() {
390+
@Override
391+
public void onSuccess(Account account) {
392+
AccountStatus status = account.getStatus();
393+
394+
switch (status) {
395+
case ONLINE:
396+
promise.resolve(true);
397+
break;
398+
399+
default:
400+
promise.resolve(false);
401+
break;
402+
}
403+
}
404+
405+
@Override
406+
public void onError(ErrorResponse errorResponse) {
407+
promise.reject("no-available-zendesk-account", "DevError: Not connected to Zendesk or network issue");
408+
}
409+
});
410+
}
407411
}

ios/RNZendeskChatModule.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ - (void) dismissChatUI {
217217
break;
218218
}
219219
} else {
220-
reject(@"no-available-zendesk-account", @"DevError: Not logged in to Zendesk", error);
220+
reject(@"no-available-zendesk-account", @"DevError: Not connected to Zendesk or network issue", error);
221221
}
222222
}];
223223
}

0 commit comments

Comments
 (0)