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.

Sign up for GitHub

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

Check for SDK initialization #688

Merged
merged 4 commits into from
Mar 6, 2024
Merged

Check for SDK initialization #688

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ac4ab3
Check for SDK initialisation on necessary method call
hani-iterable Jan 23, 2024
e01b516
Resolve git check failure
hani-iterable Jan 23, 2024
a8b869d
resolve unit test case failure
hani-iterable Jan 23, 2024
c25d06c
Merge branch 'master' into MOB-6916
Ayyanchira Feb 2, 2024
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
35 changes: 24 additions & 11 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ IterableAuthManager getAuthManager() {

@Nullable
IterableKeychain getKeychain() {
if (_applicationContext == null) {
return null;
}
if (keychain == null) {
try {
keychain = new IterableKeychain(getMainActivityContext(), config.encryptionEnforced);
Expand All @@ -164,7 +167,7 @@ static void setNotificationIcon(Context context, String iconName) {
SharedPreferences sharedPref = context.getSharedPreferences(IterableConstants.NOTIFICATION_ICON_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedPref.edit();
editor.putString(IterableConstants.NOTIFICATION_ICON_NAME, iconName);
editor.commit();
editor.apply();
}

/**
Expand All @@ -174,8 +177,7 @@ static void setNotificationIcon(Context context, String iconName) {
*/
static String getNotificationIcon(Context context) {
SharedPreferences sharedPref = context.getSharedPreferences(IterableConstants.NOTIFICATION_ICON_NAME, Context.MODE_PRIVATE);
String iconName = sharedPref.getString(IterableConstants.NOTIFICATION_ICON_NAME, "");
return iconName;
return sharedPref.getString(IterableConstants.NOTIFICATION_ICON_NAME, "");
}

/**
Expand Down Expand Up @@ -423,6 +425,9 @@ private String getDeviceId() {
}

private void storeAuthData() {
if (_applicationContext == null) {
return;
}
IterableKeychain iterableKeychain = getKeychain();
if (iterableKeychain != null) {
iterableKeychain.saveEmail(_email);
Expand All @@ -434,6 +439,9 @@ private void storeAuthData() {
}

private void retrieveEmailAndUserId() {
if (_applicationContext == null) {
return;
}
IterableKeychain iterableKeychain = getKeychain();
if (iterableKeychain != null) {
_email = iterableKeychain.getEmail();
Expand Down Expand Up @@ -552,7 +560,6 @@ protected void registerDeviceToken(@Nullable String email, @Nullable String user
if (!checkSDKInitialization()) {
return;
}

if (deviceToken == null) {
IterableLogger.e(TAG, "registerDeviceToken: token is null");
return;
Expand Down Expand Up @@ -681,6 +688,9 @@ public IterableEmbeddedManager getEmbeddedManager() {
*/
@Nullable
public IterableAttributionInfo getAttributionInfo() {
if (_applicationContext == null) {
return null;
}
return IterableAttributionInfo.fromJSONObject(
IterableUtil.retrieveExpirableJsonObject(getPreferences(), IterableConstants.SHARED_PREFS_ATTRIBUTION_INFO_KEY)
);
Expand Down Expand Up @@ -915,6 +925,9 @@ public void getAndTrackDeepLink(@NonNull String uri, @NonNull IterableHelper.Ite
* @return whether or not the app link was handled
*/
public boolean handleAppLink(@NonNull String uri) {
if (_applicationContext == null) {
return false;
}
IterableLogger.printInfo();

if (IterableDeeplinkManager.isIterableDeeplink(uri)) {
Expand Down Expand Up @@ -1110,20 +1123,20 @@ public void updateUser(@NonNull JSONObject dataFields, Boolean mergeNestedObject
* user email or user ID is set before calling this method.
*/
public void registerForPush() {
if (!checkSDKInitialization()) {
return;
if (checkSDKInitialization()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks much better now..

IterablePushRegistrationData data = new IterablePushRegistrationData(_email, _userId, _authToken, getPushIntegrationName(), IterablePushRegistrationData.PushRegistrationAction.ENABLE);
IterablePushRegistration.executePushRegistrationTask(data);
}

IterablePushRegistrationData data = new IterablePushRegistrationData(_email, _userId, _authToken, getPushIntegrationName(), IterablePushRegistrationData.PushRegistrationAction.ENABLE);
IterablePushRegistration.executePushRegistrationTask(data);
}

/**
* Disables the device from push notifications
*/
public void disablePush() {
IterablePushRegistrationData data = new IterablePushRegistrationData(_email, _userId, _authToken, getPushIntegrationName(), IterablePushRegistrationData.PushRegistrationAction.DISABLE);
IterablePushRegistration.executePushRegistrationTask(data);
if (checkSDKInitialization()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very important checks!

IterablePushRegistrationData data = new IterablePushRegistrationData(_email, _userId, _authToken, getPushIntegrationName(), IterablePushRegistrationData.PushRegistrationAction.DISABLE);
IterablePushRegistration.executePushRegistrationTask(data);
}
}

/**
Expand Down
Loading