Skip to content

(For David) Pass config down from open #57

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

Merged
merged 6 commits into from
May 24, 2018
Merged

(For David) Pass config down from open #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b72f88
Pass down config from open
garylee1 May 22, 2018
8414a00
Adds test
garylee1 May 22, 2018
1ad3b33
Only update config if null
garylee1 May 22, 2018
0b557a7
Add fallback test
garylee1 May 22, 2018
e651316
Addresses PR feedback
garylee1 May 24, 2018
00986e7
Moves appStateCollector back out
garylee1 May 24, 2018
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
5 changes: 4 additions & 1 deletion sift/src/main/java/siftscience/android/Sift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,15 @@ public static void open(@NonNull Context context,
appStateCollector = new AppStateCollector(instance, c);
unboundUserId = null;
hasUnboundUserId = false;
} else {
if (config != null) {
instance.setConfig(config);
}
}
}

appStateCollector.setActivityName(activityName == null ?
context.getClass().getSimpleName() : activityName);

}

public static void open(@NonNull Context context, String activityName) {
Expand Down
12 changes: 6 additions & 6 deletions sift/src/main/java/siftscience/android/SiftImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,19 +271,19 @@ public UnarchiveTask(boolean hasUnboundUserId) {
public void run() {
String archive;

// Unarchive Sift config
archive = archives.getString(ArchiveKey.CONFIG.key, null);
config = unarchiveConfig(archive);
Log.d(TAG, String.format("Unarchived Sift.Config: %s", archive));
// Unarchive Sift config if we don't have one
if (config == null) {
archive = archives.getString(ArchiveKey.CONFIG.key, null);
config = unarchiveConfig(archive);
Log.d(TAG, String.format("Unarchived Sift.Config: %s", archive));
}

// Unarchive User ID if we didn't have an unbound one from the Sift class
if (!this.hasUnboundUserId) {
userId = archives.getString(ArchiveKey.USER_ID.key, null);
Log.d(TAG, String.format("Unarchived User ID: %s", userId));
}



// Unarchive Queues
for (Map.Entry<String, ?> entry : archives.getAll().entrySet()) {
String identifier = ArchiveKey.getQueueIdentifier(entry.getKey());
Expand Down
37 changes: 37 additions & 0 deletions sift/src/test/java/siftscience/android/SiftTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,43 @@ public void testSift() throws Exception {
assertTrue(preferences.fields.isEmpty());
}

@Test
public void testConfigPrecedence() {
MemorySharedPreferences preferences = new MemorySharedPreferences();

Sift.Config c1 = new Sift.Config.Builder().withAccountId("sandbox").build();
Sift.Config c2 = new Sift.Config.Builder().withAccountId("prod").build();

MemorySharedPreferences.Editor editor = preferences.edit();
editor.putString("config", Sift.GSON.toJson(c1));
editor.apply();

SiftImpl sift = new SiftImpl(
mockContext(preferences), c2, "", false, mockTaskManager());

assertEquals(c2.accountId, sift.getConfig().accountId);

sift.setConfig(c1);

assertEquals(c1.accountId, sift.getConfig().accountId);
}

@Test
public void testConfigFallback() {
MemorySharedPreferences preferences = new MemorySharedPreferences();

Sift.Config c1 = new Sift.Config.Builder().withAccountId("sandbox").build();

MemorySharedPreferences.Editor editor = preferences.edit();
editor.putString("config", Sift.GSON.toJson(c1));
editor.apply();

SiftImpl sift = new SiftImpl(
mockContext(preferences), null, "", false, mockTaskManager());

assertEquals(c1.accountId, sift.getConfig().accountId);
}

@Test
public void testUnarchiveUnknownProperty() throws IOException {
String jsonAsString =
Expand Down