diff --git a/android/build.gradle b/android/build.gradle index 3de073e..e6ffc48 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,5 +36,5 @@ repositories { dependencies { compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.facebook.react:react-native:+' - compile 'ru.ok:odnoklassniki-android-sdk:2.1.6' + compile 'ru.ok:odnoklassniki-android-sdk:2.1.8' } diff --git a/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java b/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java index 4285bb6..7f3c295 100644 --- a/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java +++ b/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java @@ -19,7 +19,7 @@ import ru.ok.android.sdk.Odnoklassniki; import ru.ok.android.sdk.OkListener; -import ru.ok.android.sdk.Shared; +import ru.ok.android.sdk.SharedKt; import ru.ok.android.sdk.util.OkAuthType; import ru.ok.android.sdk.OkRequestMode; @@ -63,7 +63,7 @@ public void login(final ReadableArray scope, final Promise promise) { @Override public void onSuccess(JSONObject json) { Log.d(LOG, "Check valid token success"); - resolveWithCurrentUser(json.optString(Shared.PARAM_ACCESS_TOKEN), json.optString(Shared.PARAM_SESSION_SECRET_KEY)); + resolveWithCurrentUser(json.optString(SharedKt.PARAM_ACCESS_TOKEN), json.optString(SharedKt.PARAM_SESSION_SECRET_KEY)); } @Override @@ -95,7 +95,7 @@ private OkListener getAuthListener() { @Override public void onSuccess(final JSONObject json) { Log.d(LOG, "Activity auth success"); - resolveWithCurrentUser(json.optString(Shared.PARAM_ACCESS_TOKEN), json.optString(Shared.PARAM_SESSION_SECRET_KEY)); + resolveWithCurrentUser(json.optString(SharedKt.PARAM_ACCESS_TOKEN), json.optString(SharedKt.PARAM_SESSION_SECRET_KEY)); } @Override @@ -111,11 +111,11 @@ private void resolveWithCurrentUser(final String accessToken, final String sessi @Override public void run() { try { - String userStr = odnoklassniki.request("users.getCurrentUser", null, OkRequestMode.DEFAULT); + String userStr = odnoklassniki.request("users.getCurrentUser", null, OkRequestMode.getDEFAULT()); JSONObject user = new JSONObject(userStr); WritableMap result = Arguments.createMap(); - result.putString(Shared.PARAM_ACCESS_TOKEN, accessToken); - result.putString(Shared.PARAM_SESSION_SECRET_KEY, sessionSecretKey); + result.putString(SharedKt.PARAM_ACCESS_TOKEN, accessToken); + result.putString(SharedKt.PARAM_SESSION_SECRET_KEY, sessionSecretKey); result.putMap("user", JSONUtil.convertMap(user)); loginPromise.resolve(result); } catch (Exception e) { diff --git a/index.d.ts b/index.d.ts new file mode 100644 index 0000000..2b5b791 --- /dev/null +++ b/index.d.ts @@ -0,0 +1,16 @@ +declare module "react-native-ok-sdk" { + export const Scopes = { + VALUABLE_ACCESS: "VALUABLE_ACCESS", + SET_STATUS: "SET_STATUS", + PHOTO_CONTENT: "PHOTO_CONTENT", + GROUP_CONTENT: "GROUP_CONTENT", + VIDEO_CONTENT: "VIDEO_CONTENT", + APP_INVITE: "APP_INVITE", + LONG_ACCESS_TOKEN: "LONG_ACCESS_TOKEN", + }; + + export default class OkManager { + static initialize(appId: string, appKey: string); + static login(permissions: Array): Promise; + } +} diff --git a/package.json b/package.json index 2c19348..f74833f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-ok-sdk", - "version": "0.0.1", + "version": "0.0.2", "description": "OK SDK support for React Native apps", "main": "index.js", "scripts": { @@ -60,6 +60,6 @@ }, "homepage": "https://github.com/askiiRobotics/react-native-ok-sdk#readme", "engines": { - "node" : ">8.11.0" + "node": ">8.11.0" } }