status-im
/
react-native-keychain
mirror of https://github.com/status-im/react-native-keychain.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use Charset instead of StandardCharset for UTF-8 to support sdk < 19

This commit is contained in:
Andy Hartwell 2016-06-17 11:08:40 -07:00
parent 1ef171d799
commit 6b9eabae01
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/src/main/java/com/oblador/keychain/KeychainModule.java
View File

@ -16,8 +16,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReactMethod;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
public class KeychainModule extends ReactContextBaseJavaModule { public class KeychainModule extends ReactContextBaseJavaModule {
@ -75,7 +74,7 @@ public class KeychainModule extends ReactContextBaseJavaModule {
private String encryptWithEntity(String toEncypt, Entity entity, Callback callback) { private String encryptWithEntity(String toEncypt, Entity entity, Callback callback) {
try { try {
byte[] encryptedBytes = crypto.encrypt(toEncypt.getBytes(StandardCharsets.UTF_8), entity); byte[] encryptedBytes = crypto.encrypt(toEncypt.getBytes(Charset.forName("UTF-8")), entity);
return Base64.encodeToString(encryptedBytes, Base64.DEFAULT); return Base64.encodeToString(encryptedBytes, Base64.DEFAULT);
} catch (Exception e) { } catch (Exception e) {
Log.e("KeychainModule ", e.getLocalizedMessage()); Log.e("KeychainModule ", e.getLocalizedMessage());
@ -109,7 +108,7 @@ public class KeychainModule extends ReactContextBaseJavaModule {
byte[] decryptedUsername = crypto.decrypt(recuser, userentity); byte[] decryptedUsername = crypto.decrypt(recuser, userentity);
byte[] decryptedPass = crypto.decrypt(recpass, pwentity); byte[] decryptedPass = crypto.decrypt(recpass, pwentity);
callback.invoke("", new String(decryptedUsername, StandardCharsets.UTF_8), new String(decryptedPass, StandardCharsets.UTF_8)); callback.invoke("", new String(decryptedUsername, Charset.forName("UTF-8")), new String(decryptedPass, Charset.forName("UTF-8")));
} catch (Exception e) { } catch (Exception e) {
Log.e("KeychainModule ", e.getLocalizedMessage()); Log.e("KeychainModule ", e.getLocalizedMessage());
callback.invoke(e.getLocalizedMessage()); callback.invoke(e.getLocalizedMessage());