Skip to content

Commit

Permalink
Version update stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
GillesC committed Sep 5, 2016
1 parent d87aed2 commit 95d7fa7
Show file tree
Hide file tree
Showing 8 changed files with 670 additions and 669 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
Join the chat for questions and updates [![Join the chat at https://gitter.im/TheCocoaProject/cordova-plugin-nativestorage](https://badges.gitter.im/TheCocoaProject/cordova-plugin-nativestorage.svg)](https://gitter.im/TheCocoaProject/cordova-plugin-nativestorage?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

***
NEW: Windows is supported!

Documentation about the API prior to v2 can be found at the [wiki](https://github.com/TheCocoaProject/cordova-plugin-nativestorage/wiki/Usage-API-(prior-to-v2.0.0))
***

Expand Down Expand Up @@ -81,12 +83,13 @@ If you're using ngCordova you can use the ngCordova-wrapper:
```sh
bower install git://github.com/TheCocoaProject/ngcordova-wrapper-nativestorage --save-dev
```
For more information about the usage of the plugin check the repo for the [ngCordova-wrapper](https://github.com/TheCocoaProject/ngcordova-wrapper-nativestorage) - Ionic 1. The plugin is also supported for Ionic 2, pleas check the [official Ionic documentation](http://ionicframework.com/docs/v2/native/native-storage/) for the installation procedure and use.
For more information about the usage of the plugin check the repo for the [ngCordova-wrapper](https://github.com/TheCocoaProject/ngcordova-wrapper-nativestorage) - Ionic 1. The plugin is also supported for Ionic 2, pleas check the [official Ionic documentation](http://ionicframework.com/docs/v2/native/native-storage/) for the installation procedure and use.

##<a name="supported_platforms"></a>Supported platforms
- Android
- iOS
- Browser (for testing purposes)
- Windows (thanks to Christian Helbig see [PR](https://github.com/TheCocoaProject/cordova-plugin-nativestorage/pull/38))


##<a name="usage"></a>Usage
Expand Down Expand Up @@ -232,7 +235,7 @@ the code contains an integer whichs specifies the occurred error/problem

##<a name="problems"></a>Problems
If you encounter any problems, please remove the current plugin and re-add it.
This will install the latest version.
This will install the latest version.

If you have code issues, things not related to a bug of the plugin please consider posting your question on Stackoverflow. And add our own tag, [cordova-nativestorage](http://stackoverflow.com/tags/cordova-nativestorage).

Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "cordova-plugin-nativestorage",
"version": "2.0.2",
"description": "Native storage of variables in Android and iOS",
"author": "Gilles Callebaut <gilles.callebaut.cs@gmail.com>",
"version": "2.1.0",
"description": "Native storage of variables in Android, iOS and Windows",
"author": "Gilles Callebaut <callebaut.gilles@gmail.com>",
"contributors":[
{"name":"Alok Rajiv"}
],
Expand All @@ -11,7 +11,8 @@
"platforms": [
"android",
"ios",
"browser"
"browser",
"windows"
]
},
"repository": {
Expand All @@ -30,6 +31,7 @@
"cordova-android",
"cordova-ios",
"cordova-browser",
"cordova-windows",
"LocalStorage",
"NSUserDefaults",
"SharedPreferences"
Expand Down
6 changes: 3 additions & 3 deletions src/android/Crypto.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public class Crypto {

private static final String TAG = Crypto.class.getSimpleName();

public static final String PBKDF2_DERIVATION_ALGORITHM = "PBKDF2WithHmacSHA1";
private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";
public static final String PBKDF2_DERIVATION_ALGORITHM = "PBKDF2WithHmacSHA1"; // Android 10+
private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // Android 1+

private static String DELIMITER = "@~@~@";

private static int KEY_LENGTH = 256;
private static int ITERATION_COUNT = 1000;
private static int ITERATION_COUNT = 10000;
private static final int PKCS5_SALT_LENGTH = 8;

private static SecureRandom random = new SecureRandom();
Expand Down
2 changes: 1 addition & 1 deletion src/android/NativeStorage.java
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public void run() {
cordova.getThreadPool().execute(new Runnable() {
public void run() {
try {
/* getting arguments */
/* getting arguments */
String ref = args.getString(0);
String aString = args.getString(1);
String pwd = args.getString(2);
Expand Down
1 change: 1 addition & 0 deletions src/ios/NativeStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
- (void) setItem: (CDVInvokedUrlCommand*) command;
- (void) getItem: (CDVInvokedUrlCommand*) command;


@end
1 change: 1 addition & 0 deletions src/ios/NativeStorage.m
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,5 @@ - (void) getItem: (CDVInvokedUrlCommand*) command
}];
}


@end
Loading

0 comments on commit 95d7fa7

Please sign in to comment.