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

Lp/knock/anr jio #548

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Lp/knock/anr jio #548

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3eac0b
Bug: theoretical ANR due to synchronised method
CTLalit Feb 5, 2024
41e6ae0
Chore: Removal of log
CTLalit Feb 5, 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
96 changes: 49 additions & 47 deletions clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifecycleCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.app.Application;
import android.os.Build;
import android.os.Bundle;
import java.util.HashSet;

/**
* Class for handling activity lifecycle events
Expand All @@ -14,14 +13,57 @@
public final class ActivityLifecycleCallback {

public static boolean registered = false;
private static String cleverTapId = null;
private static final Application.ActivityLifecycleCallbacks lifecycleCallbacks = new Application.ActivityLifecycleCallbacks() {

@Override
public void onActivityCreated(Activity activity, Bundle bundle) {
if (cleverTapId != null) {
CleverTapAPI.onActivityCreated(activity, cleverTapId);
} else {
CleverTapAPI.onActivityCreated(activity);
}
}

@Override
public void onActivityDestroyed(Activity activity) {
}

@Override
public void onActivityPaused(Activity activity) {
CleverTapAPI.onActivityPaused();
}

@Override
public void onActivityResumed(Activity activity) {
if (cleverTapId != null) {
CleverTapAPI.onActivityResumed(activity, cleverTapId);
} else {
CleverTapAPI.onActivityResumed(activity);
}
}

@Override
public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
}

@Override
public void onActivityStarted(Activity activity) {
}

@Override
public void onActivityStopped(Activity activity) {
}
};

/**
* Enables lifecycle callbacks for Android devices
*
* @param application App's Application object
* @param cleverTapID Custom CleverTap ID
*/
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
public static synchronized void register(android.app.Application application, final String cleverTapID) {
public static void register(android.app.Application application, final String cleverTapID) {
if (application == null) {
Logger.i("Application instance is null/system API is too old");
return;
Expand All @@ -32,51 +74,11 @@ public static synchronized void register(android.app.Application application, fi
return;
}

cleverTapId = cleverTapID;
registered = true;
application.registerActivityLifecycleCallbacks(
new android.app.Application.ActivityLifecycleCallbacks() {

@Override
public void onActivityCreated(Activity activity, Bundle bundle) {
if (cleverTapID != null) {
CleverTapAPI.onActivityCreated(activity, cleverTapID);
} else {
CleverTapAPI.onActivityCreated(activity);
}
}

@Override
public void onActivityDestroyed(Activity activity) {
}

@Override
public void onActivityPaused(Activity activity) {
CleverTapAPI.onActivityPaused();
}

@Override
public void onActivityResumed(Activity activity) {
if (cleverTapID != null) {
CleverTapAPI.onActivityResumed(activity, cleverTapID);
} else {
CleverTapAPI.onActivityResumed(activity);
}
}

@Override
public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
}

@Override
public void onActivityStarted(Activity activity) {
}

@Override
public void onActivityStopped(Activity activity) {
}
}

);
application.unregisterActivityLifecycleCallbacks(lifecycleCallbacks);
application.registerActivityLifecycleCallbacks(lifecycleCallbacks);
Logger.i("Activity Lifecycle Callback successfully registered");
}

Expand All @@ -86,7 +88,7 @@ public void onActivityStopped(Activity activity) {
* @param application App's Application object
*/
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
public static synchronized void register(android.app.Application application) {
public static void register(android.app.Application application) {
register(application, null);
}
}