names = new ArrayList<>(instances_.size());
+ for (String key : instances_.keySet()) {
+ if (!DEFAULT_NAME.equals(key)) {
+ names.add(key);
+ }
+ }
+ return names;
+ }
+
+ /**
+ * Halts every registered instance (including the default), resetting each instance's state and
+ * clearing its stored data. The instances remain registered, so a later {@code instance(name)} or
+ * {@code sharedInstance()} returns the same (now halted) object, ready to be initialised again.
+ */
+ public static void haltAllInstances() {
+ for (Countly c : instances_.values()) {
+ c.halt();
+ }
+ }
+
+ /**
+ * Halts the named instance and removes it from the process-wide registry. Unlike {@link #halt()}
+ * (which resets an instance but keeps it registered so it can be initialised again), this
+ * additionally deregisters the object: afterwards {@link #getInstance(String)} returns null for
+ * that name and {@link #instance(String)} creates a fresh, uninitialized instance. Use this to
+ * reclaim an instance you no longer need - without it the registry retains every instance ever
+ * created for the process lifetime, which matters if instances are keyed by dynamic (unbounded)
+ * names.
+ *
+ * The default (shared) instance can not be removed: it must remain a stable object for
+ * {@link #sharedInstance()}, so a null, empty, or default name is a no-op (warned, not silent).
+ * Any reference a caller still holds to the removed instance becomes detached (halted and no
+ * longer registered); obtain a fresh handle via {@link #instance(String)} instead.
+ *
+ * @param name the instance name to halt and deregister
+ */
+ public static void removeInstance(String name) {
+ final String key = (name == null || name.isEmpty()) ? DEFAULT_NAME : name;
+ if (DEFAULT_NAME.equals(key)) {
+ sharedInstance().L.w("[Countly] removeInstance, the default (shared) instance can not be removed; use halt() to reset it. Ignoring.");
+ return;
+ }
+ //remove first so a concurrent instance(name) creates a fresh object rather than handing back
+ //the one being torn down; then halt the removed object to stop its timer, unregister its
+ //global callbacks, and clear its stored data. Once it is out of the static registry and the
+ //caller drops its handle, the whole instance (context, config, queues) becomes GC-eligible.
+ Countly c = instances_.remove(key);
+ if (c == null) {
+ sharedInstance().L.d("[Countly] removeInstance, no instance registered under [" + key + "], nothing to remove");
+ return;
+ }
+ c.L.i("[Countly] removeInstance, halting and deregistering instance [" + key + "]");
+ c.halt();
}
/**
@@ -352,6 +479,26 @@ public synchronized Countly init(CountlyConfig config) {
throw new IllegalArgumentException("valid appKey is required, but was provided either 'null' or empty String");
}
+ //resolve this instance's storage namespace from the name it is registered under. The default
+ //(shared) instance keeps the legacy, un-namespaced files for backward compatibility; a named
+ //instance gets an isolated, sanitized suffix so its queues, device id, and config never
+ //collide with another instance's storage.
+ //CountlyConfig.setInstanceName is advisory: the effective name is the one passed to
+ //instance(name). Warn loudly (never silently) when the config's name cannot take effect, so a
+ //misconfiguration does not silently land data in the wrong storage namespace.
+ if (config.instanceName != null && !config.instanceName.isEmpty() && !config.instanceName.equals(instanceName_)) {
+ if (DEFAULT_NAME.equals(instanceName_)) {
+ L.w("[Init] CountlyConfig.setInstanceName [" + config.instanceName + "] was set, but this handle is the default instance (obtained via sharedInstance()); the name is ignored and legacy storage is used. To create an isolated named instance use Countly.instance(\"" + config.instanceName + "\").init(config).");
+ } else {
+ L.w("[Init] CountlyConfig instanceName [" + config.instanceName + "] differs from the name this instance was obtained with [" + instanceName_ + "]; using [" + instanceName_ + "].");
+ }
+ }
+ if (DEFAULT_NAME.equals(instanceName_)) {
+ storageNamespace_ = "";
+ } else {
+ storageNamespace_ = CountlyStore.sanitizeNamespace(instanceName_);
+ }
+
if (config.application == null) {
L.w("[Init] Initialising the SDK without providing the application class. Some functionality will not work.");
}
@@ -480,7 +627,7 @@ public synchronized Countly init(CountlyConfig config) {
//we are running a test and using a mock object
countlyStore = config.countlyStore;
} else {
- countlyStore = new CountlyStore(config.context, L, config.explicitStorageModeEnabled);
+ countlyStore = new CountlyStore(config.context, L, config.explicitStorageModeEnabled, storageNamespace_);
config.setCountlyStore(countlyStore);
}
@@ -541,11 +688,15 @@ public synchronized Countly init(CountlyConfig config) {
if (config.immediateRequestGenerator == null) {
config.immediateRequestGenerator = new ImmediateRequestGenerator() {
@Override public ImmediateRequestI CreateImmediateRequestMaker() {
- return (new ImmediateRequestMaker());
+ ImmediateRequestMaker maker = new ImmediateRequestMaker();
+ maker.useSerialExecutor = useSerialExecutorInternal;
+ return maker;
}
@Override public ImmediateRequestI CreatePreflightRequestMaker() {
- return (new PreflightRequestMaker());
+ PreflightRequestMaker maker = new PreflightRequestMaker();
+ maker.useSerialExecutor = useSerialExecutorInternal;
+ return maker;
}
};
}
@@ -595,7 +746,7 @@ public synchronized Countly init(CountlyConfig config) {
Map migrationParams = new HashMap<>();
migrationParams.put(MigrationHelper.key_from_0_to_1_custom_id_set, config.deviceID != null);
- MigrationHelper mHelper = new MigrationHelper(config.storageProvider, L, context_);
+ MigrationHelper mHelper = new MigrationHelper(config.storageProvider, L, context_, storageNamespace_.isEmpty());
mHelper.doWork(migrationParams);
} catch (Exception ex) {
L.e("[Init] SDK failed while performing data migration. SDK is not capable to initialize.");
@@ -700,16 +851,17 @@ public synchronized Countly init(CountlyConfig config) {
}
if (config.publicKeyPinningCertificates != null) {
- sharedInstance().L.i("[Init] Enabling public key pinning");
- publicKeyPinCertificates = config.publicKeyPinningCertificates;
+ L.i("[Init] Enabling public key pinning");
+ connectionQueue_.publicKeyPinCertificates = config.publicKeyPinningCertificates;
}
if (config.certificatePinningCertificates != null) {
- Countly.sharedInstance().L.i("[Init] Enabling certificate pinning");
- certificatePinCertificates = config.certificatePinningCertificates;
+ L.i("[Init] Enabling certificate pinning");
+ connectionQueue_.certificatePinCertificates = config.certificatePinningCertificates;
}
//initialize networking queues
+ connectionQueue_.cly = this;
connectionQueue_.L = L;
connectionQueue_.healthTracker = config.healthTracker;
connectionQueue_.configProvider = config.configProvider;
@@ -757,7 +909,8 @@ public synchronized Countly init(CountlyConfig config) {
//set global application listeners
if (config.application != null) {
L.d("[Countly] Calling registerActivityLifecycleCallbacks");
- config.application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+ lifecycleApplication_ = config.application;
+ activityLifecycleCallbacks_ = new Application.ActivityLifecycleCallbacks() {
@Override
public void onActivityCreated(Activity activity, Bundle bundle) {
if (L.logEnabled()) {
@@ -831,9 +984,10 @@ public void onActivityDestroyed(Activity activity) {
module.onActivityDestroyed(activity);
}
}
- });
+ };
+ config.application.registerActivityLifecycleCallbacks(activityLifecycleCallbacks_);
- config.application.registerComponentCallbacks(new ComponentCallbacks() {
+ componentCallbacks_ = new ComponentCallbacks() {
@Override
public void onConfigurationChanged(Configuration configuration) {
L.d("[Countly] ComponentCallbacks, onConfigurationChanged");
@@ -844,7 +998,8 @@ public void onConfigurationChanged(Configuration configuration) {
public void onLowMemory() {
L.d("[Countly] ComponentCallbacks, onLowMemory");
}
- });
+ };
+ config.application.registerComponentCallbacks(componentCallbacks_);
} else {
L.d("[Countly] Global activity listeners not registred due to no Application class");
}
@@ -998,6 +1153,20 @@ public synchronized void halt() {
L.SetListener(null);
stopTimer();
+ //unregister the process-global lifecycle/component callbacks this instance registered at
+ //init so a halted instance stops receiving Activity/configuration events and does not leak
+ if (lifecycleApplication_ != null) {
+ if (activityLifecycleCallbacks_ != null) {
+ lifecycleApplication_.unregisterActivityLifecycleCallbacks(activityLifecycleCallbacks_);
+ activityLifecycleCallbacks_ = null;
+ }
+ if (componentCallbacks_ != null) {
+ lifecycleApplication_.unregisterComponentCallbacks(componentCallbacks_);
+ componentCallbacks_ = null;
+ }
+ lifecycleApplication_ = null;
+ }
+
if (connectionQueue_ != null) {
if (countlyStore != null) {
countlyStore.clear();
@@ -1231,9 +1400,12 @@ public void setLoggingEnabled(final boolean enableLogging) {
if (enableLogging && loggingForcedOffForProduction) {
//logging is suppressed for production builds, keep console output off
enableLogging_ = false;
+ L.setLoggingEnabled(false);
return;
}
enableLogging_ = enableLogging;
+ //mirror the resolved flag into this instance's logger so console output is gated per-instance
+ L.setLoggingEnabled(enableLogging_);
L.d("Enabling logging");
}
diff --git a/sdk/src/main/java/ly/count/android/sdk/CountlyConfig.java b/sdk/src/main/java/ly/count/android/sdk/CountlyConfig.java
index 7eb028097..84c08b93a 100644
--- a/sdk/src/main/java/ly/count/android/sdk/CountlyConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/CountlyConfig.java
@@ -80,6 +80,12 @@ public class CountlyConfig {
*/
protected String appKey = null;
+ // Optional, advisory instance name. This field does NOT by itself create or namespace an
+ // instance - the effective instance name is the one passed to Countly.instance(name). At init
+ // this value is only cross-checked against that registry name and a warning is logged on a
+ // mismatch (or when it is set on the default instance, where it is ignored).
+ protected String instanceName = null;
+
/**
* unique ID for the device the app is running on; note that null in deviceID means that Countly will fall back to UUID.
*/
@@ -314,6 +320,24 @@ public synchronized CountlyConfig setAppKey(String appKey) {
return this;
}
+ /**
+ * Optionally records the intended instance name on this config. The effective name of an instance
+ * is the one you pass to {@code Countly.instance(name)} - that is what creates the instance and
+ * isolates its storage (request queue, event queue, device id, configuration). This setter does
+ * not create or namespace anything on its own; at init the value is only cross-checked against
+ * the name the instance was obtained with, and a warning is logged if they differ (or if it is
+ * set on the default instance obtained via {@code sharedInstance()}, where it is ignored). To
+ * create an isolated named instance, use {@code Countly.instance(name).init(config)} - passing
+ * your app key as the name is the natural choice for one instance per Countly application.
+ *
+ * @param instanceName the name to record on the config (should match the name passed to instance())
+ * @return Returns the same config object for convenient linking
+ */
+ public synchronized CountlyConfig setInstanceName(String instanceName) {
+ this.instanceName = instanceName;
+ return this;
+ }
+
/**
* unique ID for the device the app is running on; note that null in deviceID means that Countly will fall back to UUID.
*
diff --git a/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java b/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
index 6b0a5092f..8435b12bf 100644
--- a/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
+++ b/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
@@ -75,6 +75,10 @@ public class CountlyStore implements StorageProvider, EventQueueProvider {
private final SharedPreferences preferences_;
private final SharedPreferences preferencesPush_;
+ // True only for the default-instance store. The push preferences file is shared process-wide
+ // (push is owned by the default/"primary" instance), so only the default instance may clear it -
+ // otherwise halting a named instance would wipe the primary instance's push consent and cache.
+ private final boolean ownsPushStorage;
private static final String CONSENT_GCM_PREFERENCES = "ly.count.android.api.messaging.consent.gcm";
@@ -109,15 +113,67 @@ public CountlyStore(final Context context, ModuleLog logModule) {
}
public CountlyStore(final Context context, ModuleLog logModule, boolean explicitStorageModeEnabled) {
+ this(context, logModule, explicitStorageModeEnabled, null);
+ }
+
+ /**
+ * @param storageNamespace suffix that isolates this instance's persisted state. A null or empty
+ * namespace keeps the legacy file name (used by the default instance),
+ * so an app upgrading from a single-instance SDK version keeps its
+ * request queue, event queue, device id, and schema version intact.
+ * Non-default instances get a suffixed file, isolating their storage.
+ */
+ public CountlyStore(final Context context, ModuleLog logModule, boolean explicitStorageModeEnabled, String storageNamespace) {
if (context == null) {
throw new IllegalArgumentException("must provide valid context");
}
this.explicitStorageModeEnabled = explicitStorageModeEnabled;
- preferences_ = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+ this.ownsPushStorage = (storageNamespace == null || storageNamespace.isEmpty());
+ preferences_ = context.getSharedPreferences(namespacedName(PREFERENCES, storageNamespace), Context.MODE_PRIVATE);
+ // Push preferences intentionally stay on the shared legacy file: push is owned by the
+ // default ("primary") instance and there is a single push registration per process.
preferencesPush_ = createPreferencesPush(context);
L = logModule;
}
+ /**
+ * Builds a SharedPreferences file name for a storage namespace. An empty or null namespace maps
+ * to the legacy base name (default instance, backward compatible); otherwise base + "_" + ns.
+ */
+ static String namespacedName(String base, String storageNamespace) {
+ if (storageNamespace == null || storageNamespace.isEmpty()) {
+ return base;
+ }
+ return base + "_" + storageNamespace;
+ }
+
+ /**
+ * Turns an instance name into a file-name-safe storage namespace. Non-alphanumeric characters
+ * are replaced with '_', and a short deterministic FNV-1a hash of the raw name is appended so
+ * two names that sanitize to the same string (e.g. "a.b" and "a-b") still get distinct files.
+ */
+ static String sanitizeNamespace(String name) {
+ if (name == null || name.isEmpty()) {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder(name.length() + 9);
+ for (int i = 0; i < name.length(); i++) {
+ char c = name.charAt(i);
+ if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) {
+ sb.append(c);
+ } else {
+ sb.append('_');
+ }
+ }
+ int hash = 0x811C9DC5; // FNV-1a 32-bit offset basis
+ for (int i = 0; i < name.length(); i++) {
+ hash ^= name.charAt(i);
+ hash *= 0x01000193; // FNV prime
+ }
+ sb.append('_').append(Integer.toHexString(hash));
+ return sb.toString();
+ }
+
public void setLimits(final int maxRequestQueueSize) {
this.maxRequestQueueSize = maxRequestQueueSize;
}
@@ -881,7 +937,11 @@ public synchronized void clear() {
esRequestQueueCache = null;
esEventQueueCache = null;
- preferencesPush_.edit().clear().apply();
+ // Only the default instance owns the shared push preferences file; a named instance must not
+ // wipe the primary instance's push consent/cache when it is halted or cleared.
+ if (ownsPushStorage) {
+ preferencesPush_.edit().clear().apply();
+ }
}
@Nullable
@@ -965,17 +1025,25 @@ public void setDataSchemaVersion(int version) {
return true;
}
- if (preferencesPush_.getInt(CACHED_PUSH_MESSAGING_PROVIDER, -100) != -100) {
- return true;
- }
+ // The push preferences file is shared process-wide and owned by the default ("primary")
+ // instance. Only the owning instance may treat push data as evidence that ITS storage has
+ // been used before. For a named instance the shared push file is not its own data, so
+ // counting it here would misdetect a brand-new named store as a legacy install and trigger
+ // a schema migration - which, on a fresh store, overrides a developer-supplied device ID
+ // with a generated OPEN_UDID. A named instance's freshness is judged by its own store only.
+ if (ownsPushStorage) {
+ if (preferencesPush_.getInt(CACHED_PUSH_MESSAGING_PROVIDER, -100) != -100) {
+ return true;
+ }
- if (preferencesPush_.getString(CACHED_PUSH_ACTION_ID, null) != null) {
- return true;
- }
+ if (preferencesPush_.getString(CACHED_PUSH_ACTION_ID, null) != null) {
+ return true;
+ }
- //noinspection RedundantIfStatement
- if (preferencesPush_.getString(CACHED_PUSH_ACTION_INDEX, null) != null) {
- return true;
+ //noinspection RedundantIfStatement
+ if (preferencesPush_.getString(CACHED_PUSH_ACTION_INDEX, null) != null) {
+ return true;
+ }
}
return false;
diff --git a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestMaker.java b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestMaker.java
index 3f6df650b..dc8f61d90 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestMaker.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestMaker.java
@@ -24,6 +24,9 @@ protected interface InternalImmediateRequestCallback {
InternalImmediateRequestCallback callback;
ModuleLog L;
+ // Set by the owning instance's ImmediateRequestGenerator so the executor choice follows the
+ // instance that issued the request rather than Countly.sharedInstance().
+ boolean useSerialExecutor = false;
@Override
public void doWork(@NonNull String requestData, @Nullable String customEndpoint, @NonNull ConnectionProcessor cp, boolean requestShouldBeDelayed, boolean networkingIsEnabled, @NonNull InternalImmediateRequestCallback callback, @NonNull ModuleLog log) {
@@ -31,7 +34,7 @@ public void doWork(@NonNull String requestData, @Nullable String customEndpoint,
assert cp != null;
assert log != null;
assert callback != null;
- if (Countly.sharedInstance().useSerialExecutorInternal) {
+ if (useSerialExecutor) {
log.d("[ImmediateRequestMaker] Using serial executor");
this.execute(requestData, customEndpoint, cp, requestShouldBeDelayed, networkingIsEnabled, callback, log);
} else {
diff --git a/sdk/src/main/java/ly/count/android/sdk/MigrationHelper.java b/sdk/src/main/java/ly/count/android/sdk/MigrationHelper.java
index 44dd24e27..e6bb602cf 100644
--- a/sdk/src/main/java/ly/count/android/sdk/MigrationHelper.java
+++ b/sdk/src/main/java/ly/count/android/sdk/MigrationHelper.java
@@ -26,12 +26,19 @@ class MigrationHelper {
StorageProvider storage;
ModuleLog L;
Context cachedContext;
+ // Only the default instance owns the shared push file; steps touching it run only for the owner.
+ boolean ownsPushStorage = true;
static final public String legacyDeviceIDTypeValue_AdvertisingID = "ADVERTISING_ID";
public static final String legacyCACHED_PUSH_MESSAGING_MODE = "PUSH_MESSAGING_MODE";
public MigrationHelper(@NonNull StorageProvider storage, @NonNull ModuleLog moduleLog, @NonNull Context context) {
+ this(storage, moduleLog, context, true);
+ }
+
+ /** ownsPushStorage: true only for the default instance, which owns the shared push file. */
+ public MigrationHelper(@NonNull StorageProvider storage, @NonNull ModuleLog moduleLog, @NonNull Context context, boolean ownsPushStorage) {
assert storage != null;
assert moduleLog != null;
assert context != null;
@@ -39,6 +46,7 @@ public MigrationHelper(@NonNull StorageProvider storage, @NonNull ModuleLog modu
this.storage = storage;
L = moduleLog;
cachedContext = context;
+ this.ownsPushStorage = ownsPushStorage;
L.v("[MigrationHelper] Initialising");
}
@@ -248,6 +256,10 @@ void performMigration1To2(@NonNull Map migrationParams) {
* @param migrationParams
*/
void performMigration2To3(@NonNull Map migrationParams) {
+ // Only the owner (default instance) may edit the shared, process-global push file.
+ if (!ownsPushStorage) {
+ return;
+ }
SharedPreferences sp = CountlyStore.createPreferencesPush(cachedContext);
sp.edit().remove(legacyCACHED_PUSH_MESSAGING_MODE).apply();
}
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleConfiguration.java b/sdk/src/main/java/ly/count/android/sdk/ModuleConfiguration.java
index d900a25af..3abf9df5c 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleConfiguration.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleConfiguration.java
@@ -253,7 +253,7 @@ private void updateConfigVariables(@NonNull final CountlyConfig clyConfig) {
currentVUserPropertyCacheLimit = extractValue(keyRUserPropertyCacheLimit, sb, currentVUserPropertyCacheLimit, currentVUserPropertyCacheLimit, Integer.class, (Integer value) -> value > 0);
clyConfig.setMaxRequestQueueSize(extractValue(keyRReqQueueSize, sb, clyConfig.maxRequestQueueSize, clyConfig.maxRequestQueueSize, Integer.class, (Integer value) -> value > 0));
- clyConfig.setEventQueueSizeToSend(extractValue(keyREventQueueSize, sb, clyConfig.eventQueueSizeThreshold, Countly.sharedInstance().EVENT_QUEUE_SIZE_THRESHOLD, Integer.class, (Integer value) -> value > 0));
+ clyConfig.setEventQueueSizeToSend(extractValue(keyREventQueueSize, sb, clyConfig.eventQueueSizeThreshold, _cly.EVENT_QUEUE_SIZE_THRESHOLD, Integer.class, (Integer value) -> value > 0));
clyConfig.setLoggingEnabled(extractValue(keyRLogging, sb, clyConfig.loggingEnabled, clyConfig.loggingEnabled));
clyConfig.setUpdateSessionTimerDelay(extractValue(keyRSessionUpdateInterval, sb, clyConfig.sessionUpdateTimerDelay, Long.valueOf(Countly.TIMER_DELAY_IN_SECONDS).intValue(), Integer.class, (Integer value) -> value > 0));
clyConfig.sdkInternalLimits.setMaxKeyLength(extractValue(keyRLimitKeyLength, sb, clyConfig.sdkInternalLimits.maxKeyLength, Countly.maxKeyLengthDefault, Integer.class, (Integer value) -> value > 0));
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleContent.java b/sdk/src/main/java/ly/count/android/sdk/ModuleContent.java
index 5571dd2b6..0c90eaf15 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleContent.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleContent.java
@@ -306,6 +306,15 @@ private void showContentOverlay(@NonNull Activity activity, @NonNull Map timedEvents = new HashMap<>();
+ // Per-instance timed-event store. Was 'static', which let a timed event started on one Countly
+ // instance be ended/cancelled/cleared by another; each instance now owns its own timed events.
+ final Map timedEvents = new HashMap<>();
final static String ACTION_EVENT_KEY = "[CLY]_action";
final static String VISIBILITY_KEY = "cly_v";
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleFeedback.java b/sdk/src/main/java/ly/count/android/sdk/ModuleFeedback.java
index 506c724a1..62317f89a 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleFeedback.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleFeedback.java
@@ -299,9 +299,9 @@ void presentFeedbackWidgetInternal(@Nullable final CountlyFeedbackWidget widgetI
widgetListUrl.append("&app_key=");
widgetListUrl.append(UtilsNetworking.urlEncodeString(baseInfoProvider.getAppKey()));
widgetListUrl.append("&sdk_version=");
- widgetListUrl.append(Countly.sharedInstance().COUNTLY_SDK_VERSION_STRING);
+ widgetListUrl.append(_cly.COUNTLY_SDK_VERSION_STRING);
widgetListUrl.append("&sdk_name=");
- widgetListUrl.append(Countly.sharedInstance().COUNTLY_SDK_NAME);
+ widgetListUrl.append(_cly.COUNTLY_SDK_NAME);
widgetListUrl.append("&platform=android");
// TODO: this will be the base for the custom segmentation users can send while presenting a widget
@@ -496,6 +496,13 @@ private void showFeedbackWidget_newActivity(@NonNull Context context, String url
};
}
+ // Only one content or feedback overlay may be presented at a time across the whole process,
+ // including other SDK instances (the overlay is bound to the single foreground Activity).
+ if (ContentOverlayView.isOtherOverlayPresented(feedbackOverlay)) {
+ L.w("[ModuleFeedback] a content or feedback overlay is already being shown (possibly by another instance), skipping this widget");
+ return;
+ }
+
// Clean up any existing feedback overlay
if (feedbackOverlay != null) {
feedbackOverlay.destroy();
@@ -504,6 +511,7 @@ private void showFeedbackWidget_newActivity(@NonNull Context context, String url
final Activity hostActivity = activity;
feedbackOverlay = new ContentOverlayView(
+ _cly,
hostActivity,
pConfig,
lConfig,
@@ -593,9 +601,9 @@ void getFeedbackWidgetDataInternal(@Nullable CountlyFeedbackWidget widgetInfo, @
requestData.append(UtilsNetworking.urlEncodeString(widgetInfo.widgetId));
requestData.append("&shown=1");
requestData.append("&sdk_version=");
- requestData.append(Countly.sharedInstance().COUNTLY_SDK_VERSION_STRING);
+ requestData.append(_cly.COUNTLY_SDK_VERSION_STRING);
requestData.append("&sdk_name=");
- requestData.append(Countly.sharedInstance().COUNTLY_SDK_NAME);
+ requestData.append(_cly.COUNTLY_SDK_NAME);
requestData.append("&platform=android");
requestData.append("&app_version=");
requestData.append(cachedAppVersion);
@@ -606,7 +614,7 @@ void getFeedbackWidgetDataInternal(@Nullable CountlyFeedbackWidget widgetInfo, @
L.d("[ModuleFeedback] Using following request params for retrieving widget data:[" + requestDataStr + "]");
- (new ImmediateRequestMaker()).doWork(requestDataStr, widgetDataEndpoint, cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+ iRGenerator.CreateImmediateRequestMaker().doWork(requestDataStr, widgetDataEndpoint, cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
@Override public void callback(JSONObject checkResponse) {
if (checkResponse == null) {
L.d("[ModuleFeedback] Not possible to retrieve widget data. Probably due to lack of connection to the server");
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleLog.java b/sdk/src/main/java/ly/count/android/sdk/ModuleLog.java
index a8b98c1f7..ccd499d0c 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleLog.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleLog.java
@@ -16,10 +16,26 @@ public enum LogLevel {Verbose, Debug, Info, Warning, Error}
int countWarnings = 0;
int countErrors = 0;
+ // Per-instance logging state. In a multi-instance setup every Countly object owns its own
+ // ModuleLog, so console output honors that instance's own config instead of the singleton's.
+ // loggingEnabled is mirrored from the owning Countly (see Countly#setLoggingEnabled); tag is set
+ // once per named instance in Countly.instance(name) (named instances get "Countly-", the
+ // default keeps the plain "Countly" tag) so a named instance's logcat output is attributable.
+ boolean loggingEnabled = false;
+ String tag = Countly.TAG;
+
void SetListener(LogCallback logListener) {
this.logListener = logListener;
}
+ void setLoggingEnabled(boolean loggingEnabled) {
+ this.loggingEnabled = loggingEnabled;
+ }
+
+ void setTag(String tag) {
+ this.tag = tag;
+ }
+
void trackWarning() {
if (healthTracker == null) {
countWarnings++;
@@ -60,8 +76,8 @@ public void v(String msg) {
if (!logEnabled()) {
return;
}
- if (Countly.sharedInstance().isLoggingEnabled()) {
- Log.v(Countly.TAG, msg);
+ if (loggingEnabled) {
+ Log.v(tag, msg);
}
informListener(msg, null, LogLevel.Verbose);
}
@@ -70,8 +86,8 @@ public void d(String msg) {
if (!logEnabled()) {
return;
}
- if (Countly.sharedInstance().isLoggingEnabled()) {
- Log.d(Countly.TAG, msg);
+ if (loggingEnabled) {
+ Log.d(tag, msg);
}
informListener(msg, null, LogLevel.Debug);
}
@@ -80,8 +96,8 @@ public void i(String msg) {
if (!logEnabled()) {
return;
}
- if (Countly.sharedInstance().isLoggingEnabled()) {
- Log.i(Countly.TAG, msg);
+ if (loggingEnabled) {
+ Log.i(tag, msg);
}
informListener(msg, null, LogLevel.Info);
}
@@ -95,8 +111,8 @@ public void w(String msg, Throwable t) {
if (!logEnabled()) {
return;
}
- if (Countly.sharedInstance().isLoggingEnabled()) {
- Log.w(Countly.TAG, msg);
+ if (loggingEnabled) {
+ Log.w(tag, msg);
}
informListener(msg, null, LogLevel.Warning);
}
@@ -110,14 +126,14 @@ public void e(String msg, Throwable t) {
if (!logEnabled()) {
return;
}
- if (Countly.sharedInstance().isLoggingEnabled()) {
- Log.e(Countly.TAG, msg, t);
+ if (loggingEnabled) {
+ Log.e(tag, msg, t);
}
informListener(msg, t, LogLevel.Error);
}
public boolean logEnabled() {
- return logListener != null || Countly.sharedInstance().isLoggingEnabled();
+ return logListener != null || loggingEnabled;
}
private void informListener(String msg, final Throwable t, final LogLevel level) {
@@ -133,7 +149,7 @@ private void informListener(String msg, final Throwable t, final LogLevel level)
logListener.LogHappened(msg, level);
}
} catch (Exception ex) {
- Log.e(Countly.TAG, "[ModuleLog] Failed to inform listener [" + ex.toString() + "]");
+ Log.e(tag, "[ModuleLog] Failed to inform listener [" + ex.toString() + "]");
}
}
}
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index c0c1d8d0b..ebf418eb0 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -345,7 +345,7 @@ void clearValueStoreInternal() {
RemoteConfigValueStore rcvs = loadConfig();
return rcvs.getAllValuesLegacy();
} catch (Exception ex) {
- Countly.sharedInstance().L.e("[ModuleRemoteConfig] getAllRemoteConfigValuesInternal, Call failed:[" + ex.toString() + "]");
+ L.e("[ModuleRemoteConfig] getAllRemoteConfigValuesInternal, Call failed:[" + ex.toString() + "]");
return new HashMap<>();
}
}
@@ -357,7 +357,7 @@ void clearValueStoreInternal() {
RemoteConfigValueStore rcvs = loadConfig();
return rcvs.getAllValues();
} catch (Exception ex) {
- Countly.sharedInstance().L.e("[ModuleRemoteConfig] getAllRemoteConfigValuesInternal, Call failed:[" + ex.toString() + "]");
+ L.e("[ModuleRemoteConfig] getAllRemoteConfigValuesInternal, Call failed:[" + ex.toString() + "]");
return new HashMap<>();
}
}
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleUserProfile.java b/sdk/src/main/java/ly/count/android/sdk/ModuleUserProfile.java
index e91dce3fb..03301123b 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleUserProfile.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleUserProfile.java
@@ -30,7 +30,8 @@ public class ModuleUserProfile extends ModuleBase {
String org;
String phone;
String picture;
- static String picturePath;//protected only for testing
+ String picturePath;//protected only for testing. Per-instance: was 'static', which let the last
+ // instance to set a profile-picture path clobber it for every other instance.
String gender;
Map custom;
Map customMods;
diff --git a/sdk/src/main/java/ly/count/android/sdk/PreflightRequestMaker.java b/sdk/src/main/java/ly/count/android/sdk/PreflightRequestMaker.java
index e733316d7..73a54d81d 100644
--- a/sdk/src/main/java/ly/count/android/sdk/PreflightRequestMaker.java
+++ b/sdk/src/main/java/ly/count/android/sdk/PreflightRequestMaker.java
@@ -11,6 +11,9 @@ class PreflightRequestMaker extends AsyncTask implements
ImmediateRequestMaker.InternalImmediateRequestCallback callback;
ModuleLog L;
+ // Set by the owning instance's ImmediateRequestGenerator so the executor choice follows the
+ // instance that issued the request rather than Countly.sharedInstance().
+ boolean useSerialExecutor = false;
@Override
public void doWork(@NonNull String requestData, @Nullable String customEndpoint, @NonNull ConnectionProcessor cp, boolean requestShouldBeDelayed, boolean networkingIsEnabled, @NonNull ImmediateRequestMaker.InternalImmediateRequestCallback callback, @NonNull ModuleLog log) {
@@ -18,7 +21,7 @@ public void doWork(@NonNull String requestData, @Nullable String customEndpoint,
assert cp != null;
assert log != null;
assert callback != null;
- if (Countly.sharedInstance().useSerialExecutorInternal) {
+ if (useSerialExecutor) {
log.d("[PreflightRequestMaker] Using serial executor");
this.execute(requestData, customEndpoint, cp, requestShouldBeDelayed, networkingIsEnabled, callback, log);
} else {