Skip to content

Commit 5ad7fae

Browse files
committed
Remove failure block from external id
1 parent f9eb83c commit 5ad7fae

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -200,31 +200,8 @@ public static class SendTagsError {
200200
public String getMessage() { return message; }
201201
}
202202

203-
public enum ExternalIdErrorType {
204-
REQUIRES_EXTERNAL_ID_AUTH, INVALID_OPERATION, NETWORK
205-
}
206-
207-
public static class ExternalIdError {
208-
private ExternalIdErrorType type;
209-
private String message;
210-
211-
ExternalIdError(ExternalIdErrorType type, String message) {
212-
this.type = type;
213-
this.message = message;
214-
}
215-
216-
public ExternalIdErrorType getType() {
217-
return type;
218-
}
219-
220-
public String getMessage() {
221-
return message;
222-
}
223-
}
224-
225203
public interface OSExternalUserIdUpdateCompletionHandler {
226204
void onComplete(JSONObject results);
227-
void onFailure(ExternalIdError error);
228205
}
229206

230207
interface OSInternalExternalUserIdUpdateCompletionHandler {
@@ -1597,8 +1574,6 @@ public void run() {
15971574

15981575
if (remoteParams != null && remoteParams.useUserIdAuth && externalIdAuthHash == null) {
15991576
String errorMessage = "External Id authentication (auth token) is set to REQUIRED for this application. Please provide an auth token from your backend server or change the setting in the OneSignal dashboard.";
1600-
if (completionCallback != null)
1601-
completionCallback.onFailure(new ExternalIdError(ExternalIdErrorType.REQUIRES_EXTERNAL_ID_AUTH, errorMessage));
16021577
Log(LOG_LEVEL.ERROR, errorMessage);
16031578
return;
16041579
}

OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
import java.util.concurrent.atomic.AtomicBoolean;
123123
import java.util.regex.Pattern;
124124

125-
import static com.onesignal.OneSignal.ExternalIdErrorType.REQUIRES_EXTERNAL_ID_AUTH;
126125
import static com.onesignal.OneSignalPackagePrivateHelper.GcmBroadcastReceiver_processBundle;
127126
import static com.onesignal.OneSignalPackagePrivateHelper.NotificationBundleProcessor_Process;
128127
import static com.onesignal.OneSignalPackagePrivateHelper.NotificationOpenedProcessor_processFromContext;
@@ -215,18 +214,12 @@ public void notificationOpened(OSNotificationOpenResult openedResult) {
215214
}
216215

217216
private static JSONObject lastExternalUserIdResponse;
218-
private static OneSignal.ExternalIdError lastExternalUserIdError;
219217
private static OneSignal.OSExternalUserIdUpdateCompletionHandler getExternalUserIdUpdateCompletionHandler() {
220218
return new OneSignal.OSExternalUserIdUpdateCompletionHandler() {
221219
@Override
222220
public void onComplete(JSONObject results) {
223221
lastExternalUserIdResponse = results;
224222
}
225-
226-
@Override
227-
public void onFailure(OneSignal.ExternalIdError error) {
228-
lastExternalUserIdError = error;
229-
}
230223
};
231224
}
232225

@@ -244,8 +237,7 @@ private static void cleanUp() throws Exception {
244237

245238
notificationOpenedMessage = null;
246239
lastGetTags = null;
247-
lastExternalUserIdResponse = null;
248-
lastExternalUserIdError = null;
240+
lastExternalUserIdResponse = null;;
249241

250242
ShadowGMSLocationController.reset();
251243
TestHelpers.beforeTestInitAndCleanup();
@@ -4143,9 +4135,6 @@ public void shouldSetExternalIdWithAuthHash() throws Exception {
41434135

41444136
OneSignal.setExternalUserId(testExternalId, getExternalUserIdUpdateCompletionHandler());
41454137
threadAndTaskWait();
4146-
4147-
assertNotNull(lastExternalUserIdError);
4148-
assertEquals(REQUIRES_EXTERNAL_ID_AUTH, lastExternalUserIdError.getType());
41494138
}
41504139

41514140
@Test

0 commit comments

Comments
 (0)