Skip to content

Commit 37f0fc2

Browse files
committed
Removed public idsAvailable method
* As well as it's matching OSIdsAvailableHandler * Replaced by getDeviceState and / or addSubscriptionObserver depending on how you were using idsAvailable. * Removed implemention as well internal methods supporting it
1 parent c7a1c42 commit 37f0fc2

File tree

2 files changed

+0
-68
lines changed

2 files changed

+0
-68
lines changed

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

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,6 @@ public interface OSInAppMessageClickHandler {
195195
void inAppMessageClicked(OSInAppMessageAction result);
196196
}
197197

198-
public interface OSIdsAvailableHandler {
199-
void idsAvailable(String userId, String registrationId);
200-
}
201-
202198
/**
203199
* Interface which you can implement and pass to {@link OneSignal#getTags(OSGetTagsHandler)} to
204200
* get all the tags set on a user
@@ -326,8 +322,6 @@ static boolean isInForeground() {
326322
return appEntryState;
327323
}
328324

329-
private static OSIdsAvailableHandler idsAvailableHandler;
330-
331325
private static TrackGooglePurchase trackGooglePurchase;
332326
private static TrackAmazonPurchase trackAmazonPurchase;
333327
private static TrackFirebaseAnalytics trackFirebaseAnalytics;
@@ -1845,65 +1839,6 @@ public static void deleteTags(JSONArray jsonArray, ChangeTagsUpdateHandler handl
18451839
}
18461840
}
18471841

1848-
public static void idsAvailable(final OSIdsAvailableHandler inIdsAvailableHandler) {
1849-
if (taskController.shouldQueueTaskForInit(OSTaskController.IDS_AVAILABLE)) {
1850-
logger.error("Waiting for remote params. " +
1851-
"Moving " + OSTaskController.IDS_AVAILABLE + " operation to a pending queue.");
1852-
taskController.addTaskToQueue(new Runnable() {
1853-
@Override
1854-
public void run() {
1855-
logger.debug("Running " + OSTaskController.IDS_AVAILABLE + " operation from pending queue.");
1856-
idsAvailable(inIdsAvailableHandler);
1857-
}
1858-
});
1859-
return;
1860-
}
1861-
1862-
// If applicable, check if the user provided privacy consent
1863-
if (shouldLogUserPrivacyConsentErrorMessageForMethodName(OSTaskController.IDS_AVAILABLE))
1864-
return;
1865-
1866-
idsAvailableHandler = inIdsAvailableHandler;
1867-
1868-
if (getUserId() != null) {
1869-
OSUtils.runOnMainUIThread(new Runnable() {
1870-
@Override
1871-
public void run() {
1872-
internalFireIdsAvailableCallback();
1873-
}
1874-
});
1875-
}
1876-
}
1877-
1878-
static void fireIdsAvailableCallback() {
1879-
if (idsAvailableHandler != null) {
1880-
OSUtils.runOnMainUIThread(new Runnable() {
1881-
@Override
1882-
public void run() {
1883-
internalFireIdsAvailableCallback();
1884-
}
1885-
});
1886-
}
1887-
}
1888-
1889-
private synchronized static void internalFireIdsAvailableCallback() {
1890-
if (idsAvailableHandler == null)
1891-
return;
1892-
1893-
String regId = OneSignalStateSynchronizer.getRegistrationId();
1894-
if (!OneSignalStateSynchronizer.getSubscribed())
1895-
regId = null;
1896-
1897-
String userId = getUserId();
1898-
if (userId == null)
1899-
return;
1900-
1901-
idsAvailableHandler.idsAvailable(userId, regId);
1902-
1903-
if (regId != null)
1904-
idsAvailableHandler = null;
1905-
}
1906-
19071842
static void sendPurchases(JSONArray purchases, boolean newAsExisting, OneSignalRestClient.ResponseHandler responseHandler) {
19081843

19091844
//if applicable, check if the user provided privacy consent
@@ -2269,7 +2204,6 @@ static void saveEmailId(String id) {
22692204
// Updates anything else that might have been waiting for this id.
22702205
static void updateUserIdDependents(String userId) {
22712206
saveUserId(userId);
2272-
fireIdsAvailableCallback();
22732207
internalFireGetTagsCallbacks();
22742208

22752209
getCurrentSubscriptionState(appContext).setUserId(userId);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,5 @@ protected void fireEventsForUpdateFailure(JSONObject jsonFields) {
185185
protected void onSuccessfulSync(JSONObject jsonFields) {
186186
if (jsonFields.has("email"))
187187
OneSignal.fireEmailUpdateSuccess();
188-
if (jsonFields.has("identifier"))
189-
OneSignal.fireIdsAvailableCallback();
190188
}
191189
}

0 commit comments

Comments
 (0)