Skip to content

Commit fcaec78

Browse files
author
Nino Handler
committed
Ensured that application context is used within the library
1 parent 62ab237 commit fcaec78

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

securestoragelibrary/src/main/java/de/adorsys/android/securestoragelibrary/SecurePreferences.java

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,16 @@ private SecurePreferences() {
3939
public static void setValue(@NonNull Context context,
4040
@NonNull String key,
4141
@NonNull String value) throws SecureStorageException {
42+
Context applicationContext = context.getApplicationContext();
4243
if (!KeystoreTool.keyPairExists()) {
43-
KeystoreTool.generateKeyPair(context);
44+
KeystoreTool.generateKeyPair(applicationContext);
4445
}
4546

46-
String transformedValue = KeystoreTool.encryptMessage(context, value);
47+
String transformedValue = KeystoreTool.encryptMessage(applicationContext, value);
4748
if (TextUtils.isEmpty(transformedValue)) {
4849
throw new SecureStorageException(context.getString(R.string.message_problem_encryption), null, CRYPTO_EXCEPTION);
4950
} else {
50-
setSecureValue(context, key, transformedValue);
51+
setSecureValue(applicationContext, key, transformedValue);
5152
}
5253
}
5354

@@ -90,10 +91,11 @@ public static void setValue(@NonNull Context context,
9091
public static String getStringValue(@NonNull Context context,
9192
@NonNull String key,
9293
@Nullable String defValue) {
93-
String result = getSecureValue(context, key);
94+
Context applicationContext = context.getApplicationContext();
95+
String result = getSecureValue(applicationContext, key);
9496
try {
9597
if (!TextUtils.isEmpty(result)) {
96-
return KeystoreTool.decryptMessage(context, result);
98+
return KeystoreTool.decryptMessage(applicationContext, result);
9799
} else {
98100
return defValue;
99101
}
@@ -146,33 +148,38 @@ public static Set<String> getStringSetValue(@NonNull Context context,
146148

147149
public static boolean contains(@NonNull Context context,
148150
@NonNull String key) {
149-
SharedPreferences preferences = context
151+
Context applicationContext = context.getApplicationContext();
152+
SharedPreferences preferences = applicationContext
150153
.getSharedPreferences(KEY_SHARED_PREFERENCES_NAME, MODE_PRIVATE);
151154
return preferences.contains(key);
152155
}
153156

154157
public static void removeValue(@NonNull Context context,
155158
@NonNull String key) {
156-
removeSecureValue(context, key);
159+
Context applicationContext = context.getApplicationContext();
160+
removeSecureValue(applicationContext, key);
157161
}
158162

159163
public static void clearAllValues(@NonNull Context context) throws SecureStorageException {
164+
Context applicationContext = context.getApplicationContext();
160165
if (KeystoreTool.keyPairExists()) {
161-
KeystoreTool.deleteKeyPair(context);
166+
KeystoreTool.deleteKeyPair(applicationContext);
162167
}
163-
clearAllSecureValues(context);
168+
clearAllSecureValues(applicationContext);
164169
}
165170

166171
public static void registerOnSharedPreferenceChangeListener(@NonNull Context context,
167172
@NonNull SharedPreferences.OnSharedPreferenceChangeListener listener) {
168-
SharedPreferences preferences = context
173+
Context applicationContext = context.getApplicationContext();
174+
SharedPreferences preferences = applicationContext
169175
.getSharedPreferences(KEY_SHARED_PREFERENCES_NAME, MODE_PRIVATE);
170176
preferences.registerOnSharedPreferenceChangeListener(listener);
171177
}
172178

173179
public static void unregisterOnSharedPreferenceChangeListener(@NonNull Context context,
174180
@NonNull SharedPreferences.OnSharedPreferenceChangeListener listener) {
175-
SharedPreferences preferences = context
181+
Context applicationContext = context.getApplicationContext();
182+
SharedPreferences preferences = applicationContext
176183
.getSharedPreferences(KEY_SHARED_PREFERENCES_NAME, MODE_PRIVATE);
177184
preferences.unregisterOnSharedPreferenceChangeListener(listener);
178185
}

0 commit comments

Comments
 (0)