Added Android support w/ Facebook Conceal (#19)

Updates to Android storage

use password

added android support

readme update

implemented internet credentials on android

Merge Android and iOS index into 1 file.

Update flow version

Make error handling more consistent between Android and iOS

removing unneccessary binaries

.flowconfig

@@ -42,4 +42,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-0.12.0
+0.26.0

README.md

@@ -75,10 +75,65 @@ Keychain
 
 ```
 
+### Android
+
+* Note: Android support requires React Native 0.19 or later
+* on Android, the `*InternetCredentials` calls will be resolved as calls to `*GenericPassword()` and the data will be saved in `SharedPreferences`
+
+* Edit `android/settings.gradle` to look like this (without the +):
+
+  ```diff
+  rootProject.name = 'MyApp'
+
+  include ':app'
+
+  + include ':react-native-keychain'
+  + project(':react-native-keychain').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keychain/android')
+  ```
+
+* Edit `android/app/build.gradle` (note: **app** folder) to look like this: 
+
+  ```diff
+  apply plugin: 'com.android.application'
+
+  android {
+    ...
+  }
+
+  dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.facebook.react:react-native:0.19.+'
+  + compile project(':react-native-keychain')
+  }
+  ```
+
+* Edit your `MainActivity.java` (deep in `android/app/src/main/java/...`) to look like this (note **two** places to edit):
+
+  ```diff
+  package com.myapp;
+
+  + import com.oblador.keychain.KeychainPackage;
+
+  ....
+
+  public class MainActivity extends extends ReactActivity {
+
+    @Override
+    protected List<ReactPackage> getPackages() {
+        return Arrays.<ReactPackage>asList(
+                new MainReactPackage(),
+  +             new KeychainPackage()
+        );
+    }
+    ...
+  }
+  ```
+
 ## Todo
 
 - [x] iOS support
-- [ ] Android support
+- [x] Android support
 - [ ] Storing objects as JSON
 - [ ] Expose wider selection of underlying native APIs
 

android/build.gradle

@@ -0,0 +1,35 @@
+buildscript {
+  repositories {
+    jcenter()
+  }
+
+  dependencies {
+    classpath 'com.android.tools.build:gradle:1.1.3'
+  }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+  compileSdkVersion 23
+  buildToolsVersion "23.0.1"
+
+  defaultConfig {
+    minSdkVersion 16
+    targetSdkVersion 23
+    versionCode 1
+    versionName "1.0"
+  }
+  lintOptions {
+    abortOnError false
+  }
+}
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compile 'com.facebook.react:react-native:0.19.+'
+  compile 'com.facebook.conceal:conceal:1.1.2@aar'
+}

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Oct 21 11:34:03 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip

android/gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

android/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.oblador.keychain">
+
+</manifest>

android/src/main/java/com/oblador/keychain/KeychainModule.java

@@ -0,0 +1,149 @@
+package com.oblador.keychain;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
+import android.util.Base64;
+import android.util.Log;
+import com.facebook.android.crypto.keychain.AndroidConceal;
+import com.facebook.android.crypto.keychain.SharedPrefsBackedKeyChain;
+import com.facebook.crypto.Crypto;
+import com.facebook.crypto.CryptoConfig;
+import com.facebook.crypto.Entity;
+import com.facebook.crypto.keychain.KeyChain;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+import java.nio.charset.StandardCharsets;
+
+
+public class KeychainModule extends ReactContextBaseJavaModule {
+
+    public static final String REACT_CLASS = "RNKeychainManager";
+    public static final String KEYCHAIN_DATA = "RN_KEYCHAIN";
+
+    private final Crypto crypto;
+    private final SharedPreferences prefs;
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    public KeychainModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+
+        KeyChain keyChain = new SharedPrefsBackedKeyChain(getReactApplicationContext(), CryptoConfig.KEY_256);
+        crypto = AndroidConceal.get().createDefaultCrypto(keyChain);
+
+        prefs = this.getReactApplicationContext().getSharedPreferences(KEYCHAIN_DATA, Context.MODE_PRIVATE);
+    }
+
+    @ReactMethod
+    public void setGenericPasswordForService(String service, String username, String password, Callback callback) {
+        if (!crypto.isAvailable()) {
+            Log.e("KeychainModule", "Crypto is missing");
+        }
+        if (username == null || username.isEmpty() || password == null || password.isEmpty()) {
+            Log.e("KeychainModule", "you passed empty or null username/password");
+            callback.invoke("KeychainModule: you passed empty or null username/password");
+            return;
+        }
+        service = service == null ? "" : service;
+        //Log.d("Crypto", service + username + password);
+
+        Entity userentity = Entity.create(KEYCHAIN_DATA + ":" + service + "user");
+        Entity pwentity = Entity.create(KEYCHAIN_DATA + ":" + service + "pass");
+
+        try {
+            String encryptedUsername = encryptWithEntity(username, userentity, callback);
+            String encryptedPassword = encryptWithEntity(password, pwentity, callback);
+
+            SharedPreferences.Editor prefsEditor = prefs.edit();
+            prefsEditor.putString(service + ":u", encryptedUsername);
+            prefsEditor.putString(service + ":p", encryptedPassword);
+            prefsEditor.apply();
+            Log.d("KeychainModule saved: ", service + encryptedUsername + ":" + encryptedPassword);
+        } catch (Exception e) {
+            Log.e("KeychainModule ", e.getLocalizedMessage());
+            callback.invoke(e.getLocalizedMessage());
+        }
+    }
+
+    private String encryptWithEntity(String toEncypt, Entity entity, Callback callback) {
+        try {
+            byte[] encryptedBytes = crypto.encrypt(toEncypt.getBytes(StandardCharsets.UTF_8), entity);
+            return Base64.encodeToString(encryptedBytes, Base64.DEFAULT);
+        } catch (Exception e) {
+            Log.e("KeychainModule ", e.getLocalizedMessage());
+            callback.invoke(e.getLocalizedMessage());
+            return null;
+        }
+    }
+
+    @ReactMethod
+    public void getGenericPasswordForService(String service, Callback callback) {
+        service = service == null ? "" : service;
+
+        String username = prefs.getString(service + ":u", "user_not_found");
+        String password = prefs.getString(service + ":p", "pass_not_found");
+        if (username.equals("user_not_found") || password.equals("pass_not_found")) {
+            Log.e("KeychainModule ", "no keychain entry found for service: " + service);
+            callback.invoke("no keychain entry found for service: " + service);
+            return;
+        }
+
+        Log.d("KeychainModule ", "will attempt to decrypt for " + service + username + ":" + password);
+
+        byte[] recuser = Base64.decode(username, Base64.DEFAULT);
+        byte[] recpass = Base64.decode(password, Base64.DEFAULT);
+
+
+        Entity userentity = Entity.create(KEYCHAIN_DATA + ":" + service + "user");
+        Entity pwentity = Entity.create(KEYCHAIN_DATA + ":" + service + "pass");
+
+        try {
+            byte[] decryptedUsername = crypto.decrypt(recuser, userentity);
+            byte[] decryptedPass = crypto.decrypt(recpass, pwentity);
+
+            callback.invoke("", new String(decryptedUsername, StandardCharsets.UTF_8), new String(decryptedPass, StandardCharsets.UTF_8));
+        } catch (Exception e) {
+            Log.e("KeychainModule ", e.getLocalizedMessage());
+            callback.invoke(e.getLocalizedMessage());
+        }
+    }
+
+    @ReactMethod
+    public void resetGenericPasswordForService(String service, Callback callback) {
+        service = service == null ? "" : service;
+
+        try {
+            SharedPreferences.Editor prefsEditor = prefs.edit();
+            prefsEditor.remove(service + ":u");
+            prefsEditor.remove(service + ":p");
+            prefsEditor.apply();
+        } catch (Exception e) {
+            //this probably never happens but it is here so that the android api is the same as on iOS
+            callback.invoke(e.getLocalizedMessage());
+        }
+    }
+
+    @ReactMethod
+    public void setInternetCredentialsForServer(@NonNull String server, String username, String password, Callback callback) {
+        setGenericPasswordForService(server, username, password, callback);
+    }
+
+    @ReactMethod
+    public void getInternetCredentialsForServer(@NonNull String server, Callback callback) {
+        getGenericPasswordForService(server, callback);
+    }
+
+    @ReactMethod
+    public void resetInternetCredentialsForServer(@NonNull String server, Callback callback) {
+        resetGenericPasswordForService(server, callback);
+    }
+
+
+}

android/src/main/java/com/oblador/keychain/KeychainPackage.java

@@ -0,0 +1,37 @@
+package com.oblador.keychain;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+public class KeychainPackage implements ReactPackage {
+
+    public KeychainPackage() {
+
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(
+            ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new KeychainModule(reactContext));
+        return modules;
+    }
+
+    @Override
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

index.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var { NativeModules } = require('react-native');
+var { NativeModules, Platform } = require('react-native');
 var RNKeychainManager = NativeModules.RNKeychainManager;
 
 var Keychain = {
@@ -149,6 +149,9 @@ var Keychain = {
 };
 
 function convertError(err) {
+  if (Platform.OS === 'android') {
+      return new Error(err);
+  }
   if (!err) {
     return null;
   }

package.json

@@ -2,7 +2,7 @@
   "name": "react-native-keychain",
   "version": "0.2.7",
   "description": "Keychain Access for React Native",
-  "main": "index.ios.js",
+  "main": "index",
   "scripts": {
     "test": "flow"
   },