Skip to content

Commit 221d0a7

Browse files
milos1290milos1290
authored
Removing deprecations (#396)
* Removing deprecations * Fixing failing tests
1 parent aa35d09 commit 221d0a7

File tree

7 files changed

+11
-148
lines changed

7 files changed

+11
-148
lines changed

‎AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -281,16 +281,6 @@ public static boolean isScreenTrackingEnabled() {
281281
return LeanplumInternal.getIsScreenTrackingEnabled();
282282
}
283283

284-
/**
285-
* Whether interface editing is enabled or not.
286-
*
287-
* @return Boolean - true if enabled
288-
*/
289-
@Deprecated
290-
public static boolean isInterfaceEditingEnabled() {
291-
return false;
292-
}
293-
294284
/**
295285
* Sets the type of device ID to use. Default: {@link LeanplumDeviceIdMode#MD5_MAC_ADDRESS}
296286
*/
@@ -519,8 +509,6 @@ static synchronized void start(final Context context, final String userId,
519509
VarCache.applyVariableDiffs(
520510
new HashMap<String, Object>(),
521511
new HashMap<String, Object>(),
522-
VarCache.getUpdateRuleDiffs(),
523-
VarCache.getEventRuleDiffs(),
524512
new HashMap<String, Object>(),
525513
new ArrayList<Map<String, Object>>(),
526514
new HashMap<String, Object>());
@@ -905,10 +893,6 @@ private static void applyContentInResponse(JSONObject response, boolean alwaysAp
905893
response.optJSONObject(Constants.Keys.VARS));
906894
Map<String, Object> messages = JsonConverter.mapFromJsonOrDefault(
907895
response.optJSONObject(Constants.Keys.MESSAGES));
908-
List<Map<String, Object>> updateRules = JsonConverter.listFromJsonOrDefault(
909-
response.optJSONArray(Constants.Keys.UPDATE_RULES));
910-
List<Map<String, Object>> eventRules = JsonConverter.listFromJsonOrDefault(
911-
response.optJSONArray(Constants.Keys.EVENT_RULES));
912896
Map<String, Object> regions = JsonConverter.mapFromJsonOrDefault(
913897
response.optJSONObject(Constants.Keys.REGIONS));
914898
List<Map<String, Object>> variants = JsonConverter.listFromJsonOrDefault(
@@ -919,12 +903,9 @@ private static void applyContentInResponse(JSONObject response, boolean alwaysAp
919903
if (alwaysApply
920904
|| !values.equals(VarCache.getDiffs())
921905
|| !messages.equals(VarCache.getMessageDiffs())
922-
|| !updateRules.equals(VarCache.getUpdateRuleDiffs())
923-
|| !eventRules.equals(VarCache.getEventRuleDiffs())
924906
|| !variants.equals(VarCache.variants())
925907
|| !regions.equals(VarCache.regions())) {
926-
VarCache.applyVariableDiffs(values, messages, updateRules,
927-
eventRules, regions, variants, variantDebugInfo);
908+
VarCache.applyVariableDiffs(values, messages, regions, variants, variantDebugInfo);
928909
}
929910
}
930911

@@ -1814,11 +1795,9 @@ public static void track(String event, double value, String info) {
18141795
* choosing, and will show up in the dashboard. A state is a section of your app that the user is
18151796
* currently in.
18161797
*
1817-
* @param state Name of the state. State may be empty for message impression events.
1798+
* @param event Event type.
18181799
* @param info Basic context associated with the state, such as the item purchased. info is
18191800
* treated like a default parameter.
1820-
* @param params Key-value pairs with metrics or data associated with the state. Parameters can be
1821-
* strings or numbers. You can use up to 200 different parameter names in your app.
18221801
*/
18231802

18241803
public static void trackGeofence(GeofenceEventType event, String info) {

‎AndroidSDKCore/src/main/java/com/leanplum/internal/Constants.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ public static class Defaults {
7676
public static final String ATTRIBUTES_KEY = "__leanplum_attributes";
7777
public static final String TOKEN_KEY = "__leanplum_token";
7878
public static final String MESSAGES_KEY = "__leanplum_messages";
79-
public static final String UPDATE_RULES_KEY = "__leanplum_update_rules";
80-
public static final String EVENT_RULES_KEY = "__leanplum_event_rules";
8179
public static final String REGIONS_KEY = "regions";
8280
public static final String MESSAGE_TRIGGER_OCCURRENCES_KEY =
8381
"__leanplum_message_trigger_occurrences_%s";
@@ -194,8 +192,6 @@ public static class Keys {
194192
public static final String LOCATION_ACCURACY_TYPE = "locationAccuracyType";
195193
public static final String MESSAGE_DATA = "messageData";
196194
public static final String MESSAGES = "messages";
197-
public static final String UPDATE_RULES = "interfaceRules";
198-
public static final String EVENT_RULES = "interfaceEvents";
199195
public static final String INBOX_MESSAGES = "newsfeedMessages";
200196
public static final String PUSH_MESSAGE_ACTION = "_lpx";
201197
public static final String PUSH_MESSAGE_ID_NO_MUTE_WITH_ACTION = "_lpm";

‎AndroidSDKCore/src/main/java/com/leanplum/internal/Socket.java‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public class Socket {
5353
private static final String TAG = "Leanplum";
5454
private static final String EVENT_CONTENT_RESPONSE = "getContentResponse";
5555
private static final String EVENT_UPDATE_VARS = "updateVars";
56-
private static final String EVENT_PREVIEW_UPDATE_RULES = "previewUpdateRules";
5756
private static final String EVENT_TRIGGER = "trigger";
5857
private static final String EVENT_GET_VARIABLES = "getVariables";
5958
private static final String EVENT_GET_ACTIONS = "getActions";
@@ -125,9 +124,6 @@ public void on(String event, JSONArray arguments) {
125124
case EVENT_TRIGGER:
126125
handleTriggerEvent(arguments);
127126
break;
128-
case EVENT_PREVIEW_UPDATE_RULES:
129-
previewUpdateRules(arguments);
130-
break;
131127
case EVENT_GET_VARIABLES:
132128
handleGetVariablesEvent();
133129
break;
@@ -306,29 +302,14 @@ static void handleApplyVarsEvent(JSONArray args) {
306302
return;
307303
}
308304
VarCache.applyVariableDiffs(
309-
JsonConverter.mapFromJson(object), null, null, null, null, null, null);
305+
JsonConverter.mapFromJson(object), null, null, null, null);
310306
} catch (JSONException e) {
311307
Log.e("Couldn't applyVars for preview.", e);
312308
} catch (Throwable e) {
313309
Util.handleException(e);
314310
}
315311
}
316312

317-
void previewUpdateRules(JSONArray arguments) {
318-
try {
319-
JSONObject packetData = arguments.getJSONObject(0);
320-
JSONArray rules = packetData.optJSONArray("rules");
321-
322-
if (rules != null) {
323-
List<Map<String, Object>> ruleDiffs = JsonConverter.listFromJson(rules);
324-
VarCache.applyUpdateRuleDiffs(ruleDiffs);
325-
}
326-
} catch (Exception e) {
327-
Log.e("Error parsing data");
328-
return;
329-
}
330-
}
331-
332313
/**
333314
* Returns whether the socket connection is established
334315
*

‎AndroidSDKCore/src/main/java/com/leanplum/internal/VarCache.java‎

Lines changed: 5 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,11 @@ public class VarCache {
7272
private static Map<String, Object> diffs = new HashMap<>();
7373
private static Map<String, Object> regions = new HashMap<>();
7474
private static Map<String, Object> messageDiffs = new HashMap<>();
75-
private static List<Map<String, Object>> updateRuleDiffs;
76-
private static List<Map<String, Object>> eventRuleDiffs;
7775
private static Map<String, Object> devModeValuesFromServer;
7876
private static Map<String, Object> devModeFileAttributesFromServer;
7977
private static Map<String, Object> devModeActionDefinitionsFromServer;
8078
private static List<Map<String, Object>> variants = new ArrayList<>();
8179
private static CacheUpdateBlock updateBlock;
82-
private static CacheUpdateBlock interfaceUpdateBlock;
83-
private static CacheUpdateBlock eventsUpdateBlock;
8480
private static boolean hasReceivedDiffs = false;
8581
private static Map<String, Object> messages = new HashMap<>();
8682
private static Object merged;
@@ -307,14 +303,6 @@ public static Map<String, Object> getMessageDiffs() {
307303
return messageDiffs;
308304
}
309305

310-
public static List<Map<String, Object>> getUpdateRuleDiffs() {
311-
return updateRuleDiffs;
312-
}
313-
314-
public static List<Map<String, Object>> getEventRuleDiffs() {
315-
return eventRuleDiffs;
316-
}
317-
318306
public static Map<String, Object> regions() {
319307
return regions;
320308
}
@@ -345,8 +333,6 @@ public static void loadDiffs() {
345333
applyVariableDiffs(
346334
new HashMap<String, Object>(),
347335
new HashMap<String, Object>(),
348-
new ArrayList<Map<String, Object>>(),
349-
new ArrayList<Map<String, Object>>(),
350336
new HashMap<String, Object>(),
351337
new ArrayList<Map<String, Object>>(),
352338
new HashMap<String, Object>());
@@ -359,18 +345,12 @@ public static void loadDiffs() {
359345
defaults, Constants.Defaults.VARIABLES_KEY, "{}");
360346
String messages = aesContext.decodePreference(
361347
defaults, Constants.Defaults.MESSAGES_KEY, "{}");
362-
String updateRules = aesContext.decodePreference(
363-
defaults, Constants.Defaults.UPDATE_RULES_KEY, "[]");
364-
String eventRules = aesContext.decodePreference(
365-
defaults, Constants.Defaults.EVENT_RULES_KEY, "[]");
366348
String regions = aesContext.decodePreference(defaults, Constants.Defaults.REGIONS_KEY, "{}");
367349
String variants = aesContext.decodePreference(defaults, Constants.Keys.VARIANTS, "[]");
368350
String variantDebugInfo = aesContext.decodePreference(defaults, Constants.Keys.VARIANT_DEBUG_INFO, "{}");
369351
applyVariableDiffs(
370352
JsonConverter.fromJson(variables),
371353
JsonConverter.fromJson(messages),
372-
JsonConverter.<Map<String, Object>>listFromJson(new JSONArray(updateRules)),
373-
JsonConverter.<Map<String, Object>>listFromJson(new JSONArray(eventRules)),
374354
JsonConverter.fromJson(regions),
375355
JsonConverter.<Map<String, Object>>listFromJson(new JSONArray(variants)),
376356
JsonConverter.fromJson(variantDebugInfo));
@@ -415,32 +395,13 @@ public static void saveDiffs() {
415395

416396
// Crypt functions return input text if there was a problem.
417397
AESCrypt aesContext = new AESCrypt(RequestOld.appId(), RequestOld.token());
398+
418399
String variablesCipher = aesContext.encrypt(JsonConverter.toJson(diffs));
419400
editor.putString(Constants.Defaults.VARIABLES_KEY, variablesCipher);
420401

421402
String messagesCipher = aesContext.encrypt(JsonConverter.toJson(messages));
422403
editor.putString(Constants.Defaults.MESSAGES_KEY, messagesCipher);
423404

424-
try {
425-
if (updateRuleDiffs != null && !updateRuleDiffs.isEmpty()) {
426-
String updateRulesCipher = aesContext.encrypt(
427-
JsonConverter.listToJsonArray(updateRuleDiffs).toString());
428-
editor.putString(Constants.Defaults.UPDATE_RULES_KEY, updateRulesCipher);
429-
}
430-
} catch (JSONException e) {
431-
Log.e("Error converting updateRuleDiffs to JSON", e);
432-
}
433-
434-
try {
435-
if (eventRuleDiffs != null && !eventRuleDiffs.isEmpty()) {
436-
String eventRulesCipher = aesContext.encrypt(
437-
JsonConverter.listToJsonArray(eventRuleDiffs).toString());
438-
editor.putString(Constants.Defaults.EVENT_RULES_KEY, eventRulesCipher);
439-
}
440-
} catch (JSONException e) {
441-
Log.e("Error converting eventRuleDiffs to JSON", e);
442-
}
443-
444405
String regionsCipher = aesContext.encrypt(JsonConverter.toJson(regions));
445406
editor.putString(Constants.Defaults.REGIONS_KEY, regionsCipher);
446407

@@ -513,8 +474,6 @@ private static void fileVariableFinish() {
513474
public static void applyVariableDiffs(
514475
Map<String, Object> diffs,
515476
Map<String, Object> messages,
516-
List<Map<String, Object>> updateRules,
517-
List<Map<String, Object>> eventRules,
518477
Map<String, Object> regions,
519478
List<Map<String, Object>> variants,
520479
Map<String, Object> variantDebugInfo) {
@@ -526,7 +485,10 @@ public static void applyVariableDiffs(
526485
// Have to copy the dictionary because a dictionary variable may add a new sub-variable,
527486
// modifying the variable dictionary.
528487
for (String name : new HashMap<>(vars).keySet()) {
529-
vars.get(name).update();
488+
Var<?> var = vars.get(name);
489+
if (var != null) {
490+
var.update();
491+
}
530492
}
531493
fileVariableFinish();
532494
}
@@ -577,19 +539,6 @@ public static void applyVariableDiffs(
577539
}
578540
}
579541

580-
boolean interfaceUpdated = false;
581-
if (updateRules != null) {
582-
interfaceUpdated = !(updateRules.equals(updateRuleDiffs));
583-
updateRuleDiffs = new ArrayList<>(updateRules);
584-
VarCache.downloadUpdateRulesImages();
585-
}
586-
587-
boolean eventsUpdated = false;
588-
if (eventRules != null) {
589-
eventsUpdated = !(eventRules.equals(eventRuleDiffs));
590-
eventRuleDiffs = new ArrayList<>(eventRules);
591-
}
592-
593542
if (variants != null) {
594543
VarCache.variants = variants;
595544
}
@@ -603,41 +552,10 @@ public static void applyVariableDiffs(
603552
if (!silent) {
604553
saveDiffs();
605554
triggerHasReceivedDiffs();
606-
607-
if (interfaceUpdated && interfaceUpdateBlock != null) {
608-
interfaceUpdateBlock.updateCache();
609-
}
610-
611-
if (eventsUpdated && eventsUpdateBlock != null) {
612-
eventsUpdateBlock.updateCache();
613-
}
614555
}
615556
Leanplum.countAggregator().incrementCount("apply_variable_diffs");
616557
}
617558

618-
static void applyUpdateRuleDiffs(List<Map<String, Object>> updateRuleDiffs) {
619-
VarCache.updateRuleDiffs = updateRuleDiffs;
620-
VarCache.downloadUpdateRulesImages();
621-
if (interfaceUpdateBlock != null) {
622-
interfaceUpdateBlock.updateCache();
623-
}
624-
VarCache.saveDiffs();
625-
}
626-
627-
private static void downloadUpdateRulesImages() {
628-
for (Map value : VarCache.updateRuleDiffs) {
629-
List changes = (List) value.get("changes");
630-
for (Object change : changes) {
631-
Map<String, String> castedChange = CollectionUtil.uncheckedCast(change);
632-
String key = castedChange.get("key");
633-
if (key != null && key.contains("image")) {
634-
String name = castedChange.get("value");
635-
FileManager.maybeDownloadFile(true, name, null, null, null);
636-
}
637-
}
638-
}
639-
}
640-
641559
public static int contentVersion() {
642560
return contentVersion;
643561
}
@@ -810,16 +728,6 @@ public static void onUpdate(CacheUpdateBlock block) {
810728
Leanplum.countAggregator().incrementCount("on_update_varcache");
811729
}
812730

813-
public static void onInterfaceUpdate(CacheUpdateBlock block) {
814-
interfaceUpdateBlock = block;
815-
Leanplum.countAggregator().incrementCount("on_interface_update");
816-
}
817-
818-
public static void onEventsUpdate(CacheUpdateBlock block) {
819-
eventsUpdateBlock = block;
820-
Leanplum.countAggregator().incrementCount("on_events_update");
821-
}
822-
823731
public static List<Map<String, Object>> variants() {
824732
return variants;
825733
}

‎AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void response(JSONObject response) {
199199
messages = null;
200200
}
201201
if (values != null || messages != null) {
202-
VarCache.applyVariableDiffs(values, messages, null, null, regions, variants, null);
202+
VarCache.applyVariableDiffs(values, messages, regions, variants, null);
203203
}
204204
}
205205
onComplete.variablesChanged();

‎AndroidSDKTests/src/test/java/com/leanplum/LeanplumActionContextTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,7 @@ public void testPrefetchingChainedMessage() {
287287
// Add chained message to VarCache.
288288
VarCache.applyVariableDiffs(null, new HashMap<>(
289289
ImmutableMap.<String, Object>of(Long.toString(chainedMessageId),
290-
ImmutableMap.<String, Object>of())),
291-
null, null, null, null, null);
290+
ImmutableMap.<String, Object>of())), null, null, null);
292291
// Since it now exists locally, we should return false for forceContentUpdate.
293292
Assert.assertFalse(ActionContext.shouldForceContentUpdateForChainedMessage(
294293
JsonConverter.fromJson(jsonData)));

‎AndroidSDKTests/src/test/java/com/leanplum/LeanplumTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public void testMetadata() {
425425
}});
426426
}};
427427

428-
VarCache.applyVariableDiffs(null, messages, null, null, null, variants, null);
428+
VarCache.applyVariableDiffs(null, messages, null, variants, null);
429429
assertEquals(variants, Leanplum.variants());
430430
assertEquals(messages, Leanplum.messageMetadata());
431431
}

0 commit comments

Comments
 (0)