Skip to content

dont-encrypt-nulls #21

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

Open
kmityakov wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

dont-encrypt-nulls #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13cd07
Don't encrypt null values
kmityakov Jul 18, 2016
720a988
added testSetNulls
kmityakov Jul 18, 2016
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
15 changes: 15 additions & 0 deletions library/src/androidTest/java/in/co/ophio/secure/core/ObscuredSharedPreferencesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.SharedPreferences;
import android.test.AndroidTestCase;
import org.mockito.internal.util.collections.Sets;

import java.util.HashSet;
import java.util.Map;
Expand Down Expand Up @@ -99,4 +100,18 @@ public void testRemove() throws Exception {
obscuredSharedPreferences.edit().remove(KEY_STRING);
assertThat(obscuredSharedPreferences.contains(KEY_STRING), is(true));
}

public void testSetNulls() throws Exception {
obscuredSharedPreferences.edit().putString(KEY_STRING, "test").commit();
assertNotNull(obscuredSharedPreferences.getString(KEY_STRING, null));

obscuredSharedPreferences.edit().putString(KEY_STRING, null).commit();
assertNull(obscuredSharedPreferences.getString(KEY_STRING, null));

obscuredSharedPreferences.edit().putStringSet(KEY_STRINGSET, Sets.newSet("one", "two")).commit();
assertNotNull(obscuredSharedPreferences.getStringSet(KEY_STRINGSET, null));

obscuredSharedPreferences.edit().putStringSet(KEY_STRINGSET, null).commit();
assertNull(obscuredSharedPreferences.getStringSet(KEY_STRINGSET, null));
}
}
4 changes: 2 additions & 2 deletions library/src/main/java/in/co/ophio/secure/core/ObscuredSharedPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,13 +283,13 @@ public Editor putLong(String key, long value) {

@Override
public Editor putString(String key, String value) {
delegate.putString(encryptKey(key), encrypt(value));
delegate.putString(encryptKey(key), value != null ? encrypt(value) : null);
return this;
}

@Override
public SharedPreferences.Editor putStringSet(String key, Set<String> values) {
delegate.putStringSet(encryptKey(key), encryptSet(values));
delegate.putStringSet(encryptKey(key), values != null ? encryptSet(values) : null);
return this;
}

Expand Down