Skip to content

Commit 1998d92

Browse files
divyanshunegidivyanshunegi
committed
fragment changes done
1 parent 99d833b commit 1998d92

File tree

4 files changed

+174
-82
lines changed

4 files changed

+174
-82
lines changed

‎android/android.iml

Lines changed: 128 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -8,14 +8,138 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
20+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
21+
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
22+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23+
<option name="LIBRARY_PROJECT" value="true" />
1224
</configuration>
1325
</facet>
1426
</component>
15-
<component name="NewModuleRootManager" inherit-compiler-output="true">
27+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
28+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
1630
<exclude-output />
17-
<content url="file://$MODULE_DIR$" />
18-
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
31+
<content url="file://$MODULE_DIR$">
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex-instrumentation/1.0.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.8.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.8.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.8.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp/0.8.1/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.8.1/jars" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.20.1/jars" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.delight-im/Android-AdvancedWebView/v3.0.0/jars" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
114+
</content>
115+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
19116
<orderEntry type="sourceFolder" forTests="false" />
117+
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
118+
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
119+
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
120+
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
121+
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
122+
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
123+
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
124+
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
125+
<orderEntry type="library" exported="" name="scribejava-apis-3.4.1" level="project" />
126+
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
127+
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
128+
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
129+
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
130+
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
131+
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
132+
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
133+
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
134+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
135+
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
136+
<orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
137+
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
138+
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
139+
<orderEntry type="library" exported="" name="Android-AdvancedWebView-v3.0.0" level="project" />
140+
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
141+
<orderEntry type="library" exported="" name="scribejava-core-3.4.1" level="project" />
142+
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
143+
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
20144
</component>
21145
</module>

‎android/local.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
# Location of the SDK. This is only used by Gradle.
88
# For customization when using a Version Control System, please read the
99
# header note.
10-
#Fri Sep 02 11:41:31 PDT 2016
11-
sdk.dir=/usr/local/opt/android-sdk
12-
ndk.dir=/usr/local/opt/android-ndk
10+
#Tue Apr 11 11:36:49 IST 2017
11+
sdk.dir=/Users/divyanshunegi/Downloads/adt-bundle-mac-x86_64-20140321/sdk

‎android/src/main/java/io/fullstack/oauth/OAuthManagerDialogFragment.java

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,40 @@
11
package io.fullstack.oauth;
22

3-
import im.delight.android.webview.AdvancedWebView;
4-
import android.app.Dialog;
5-
6-
import android.net.Uri;
7-
import java.util.Set;
8-
import java.net.URL;
9-
import java.net.MalformedURLException;
10-
import android.text.TextUtils;
113
import android.annotation.SuppressLint;
12-
import android.widget.LinearLayout;
13-
import android.view.Gravity;
14-
import android.os.Build;
15-
164
import android.app.DialogFragment;
17-
import android.content.DialogInterface;
18-
import android.widget.FrameLayout;
19-
20-
import android.webkit.WebView;
21-
import android.view.View;
22-
import android.webkit.WebViewClient;
5+
import android.content.Context;
236
import android.content.Intent;
7+
import android.graphics.Bitmap;
8+
import android.net.Uri;
9+
import android.os.Build;
10+
import android.os.Bundle;
11+
import android.text.TextUtils;
12+
import android.util.DisplayMetrics;
13+
import android.util.Log;
14+
import android.view.Display;
2415
import android.view.LayoutInflater;
16+
import android.view.View;
2517
import android.view.ViewGroup;
2618
import android.view.ViewGroup.LayoutParams;
27-
import android.content.Context;
28-
import android.util.DisplayMetrics;
29-
import android.view.Display;
30-
import java.lang.reflect.Method;
3119
import android.view.WindowManager;
20+
import android.webkit.WebView;
21+
import android.webkit.WebViewClient;
22+
import android.widget.FrameLayout;
3223

33-
import com.github.scribejava.core.model.OAuth1AccessToken;
34-
import com.github.scribejava.core.model.OAuth1RequestToken;
35-
import android.util.Log;
36-
import android.graphics.Bitmap;
37-
import android.os.Bundle;
38-
import android.app.Fragment;
39-
import java.io.IOException;
4024
import com.facebook.react.bridge.ReactContext;
25+
import com.github.scribejava.core.model.OAuth1AccessToken;
26+
27+
import java.lang.reflect.Method;
28+
import java.util.Set;
29+
30+
import im.delight.android.webview.AdvancedWebView;
4131

4232
public class OAuthManagerDialogFragment extends DialogFragment implements AdvancedWebView.Listener {
4333

4434
private static final int WEBVIEW_TAG = 100001;
4535
private static final int WIDGET_TAG = 100002;
4636

47-
private static final String TAG = "OAuthManagerDialogFragment";
37+
private static final String TAG = "OauthFragment";
4838
private OAuthManagerFragmentController mController;
4939

5040
private ReactContext mReactContext;
@@ -57,7 +47,6 @@ public static final OAuthManagerDialogFragment newInstance(
5747
Bundle args = new Bundle();
5848
OAuthManagerDialogFragment frag =
5949
new OAuthManagerDialogFragment(reactContext, controller);
60-
6150
return frag;
6251
}
6352

@@ -90,7 +79,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
9079
// mWebView = (AdvancedWebView) rootView.findViewById(R.id.webview);
9180
Log.d(TAG, "Creating webview");
9281
mWebView = new AdvancedWebView(context);
93-
mWebView.setId(WEBVIEW_TAG);
82+
// mWebView.setId(WEBVIEW_TAG);
9483
mWebView.setListener(this, this);
9584
mWebView.setVisibility(View.VISIBLE);
9685
mWebView.getSettings().setJavaScriptEnabled(true);
@@ -179,7 +168,6 @@ private boolean interceptUrl(WebView view, String url, boolean loadUrl) {
179168
Log.i(TAG, "interceptUrl called with url: " + url);
180169
if (isCallbackUri(url, mController.getCallbackUrl())) {
181170
mController.getAccessToken(mWebView, url);
182-
183171
return true;
184172
}
185173

@@ -203,11 +191,11 @@ public void onStart() {
203191
Log.d(TAG, "onStart for DialogFragment");
204192
}
205193

206-
@Override
207-
public void onDismiss(final DialogInterface dialog) {
208-
super.onDismiss(dialog);
209-
Log.d(TAG, "Dismissing dialog");
210-
}
194+
// @Override
195+
// public void onDismiss(final DialogInterface dialog) {
196+
// super.onDismiss(dialog);
197+
// Log.d(TAG, "Dismissing dialog");
198+
// }
211199

212200

213201
// @Override

‎android/src/main/java/io/fullstack/oauth/OAuthManagerModule.java

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,38 @@
11
package io.fullstack.oauth;
22

3-
import android.util.Log;
3+
import android.app.Activity;
4+
import android.app.FragmentManager;
45
import android.content.Context;
5-
import android.net.Uri;
6-
import android.os.Handler;
7-
import android.content.SharedPreferences;
8-
9-
import java.net.URL;
10-
import java.net.MalformedURLException;
11-
126
import android.support.annotation.Nullable;
13-
import android.app.FragmentManager;
14-
import android.support.v4.app.FragmentActivity;
15-
import android.app.Activity;
16-
import android.text.TextUtils;
17-
18-
import java.io.IOException;
19-
import java.util.Map;
20-
import java.util.Set;
21-
import java.util.Iterator;
22-
import java.util.HashMap;
23-
import java.util.List;
24-
import java.util.ArrayList;
7+
import android.util.Log;
258

269
import com.facebook.react.bridge.Arguments;
27-
import com.facebook.react.bridge.LifecycleEventListener;
10+
import com.facebook.react.bridge.Callback;
2811
import com.facebook.react.bridge.ReactApplicationContext;
12+
import com.facebook.react.bridge.ReactContext;
2913
import com.facebook.react.bridge.ReactContextBaseJavaModule;
3014
import com.facebook.react.bridge.ReactMethod;
31-
import com.facebook.react.bridge.Callback;
32-
import com.facebook.react.bridge.WritableMap;
33-
import com.facebook.react.bridge.ReadableMap;
3415
import com.facebook.react.bridge.ReadableArray;
35-
import com.facebook.react.bridge.ReadableType;
16+
import com.facebook.react.bridge.ReadableMap;
3617
import com.facebook.react.bridge.ReadableMapKeySetIterator;
37-
import com.facebook.react.bridge.ReactContext;
38-
39-
import com.github.scribejava.core.builder.api.BaseApi;
40-
import com.github.scribejava.core.model.Verb;
41-
42-
import com.github.scribejava.core.builder.ServiceBuilder;
18+
import com.facebook.react.bridge.ReadableType;
19+
import com.facebook.react.bridge.WritableMap;
4320
import com.github.scribejava.core.model.OAuth1AccessToken;
44-
import com.github.scribejava.core.model.OAuth1RequestToken;
21+
import com.github.scribejava.core.model.OAuth2AccessToken;
4522
import com.github.scribejava.core.model.OAuthRequest;
46-
import com.github.scribejava.core.model.OAuthConfig;
4723
import com.github.scribejava.core.model.Response;
4824
import com.github.scribejava.core.model.Verb;
4925
import com.github.scribejava.core.oauth.OAuth10aService;
50-
51-
import com.github.scribejava.core.model.OAuth2AccessToken;
5226
import com.github.scribejava.core.oauth.OAuth20Service;
5327

28+
import java.io.IOException;
29+
import java.net.MalformedURLException;
30+
import java.net.URL;
31+
import java.util.ArrayList;
32+
import java.util.HashMap;
33+
import java.util.List;
34+
import java.util.Map;
35+
5436
class ProviderNotConfiguredException extends Exception {
5537
public ProviderNotConfiguredException(String message) {
5638
super(message);
@@ -71,7 +53,6 @@ class OAuthManagerModule extends ReactContextBaseJavaModule {
7153
public OAuthManagerModule(ReactApplicationContext reactContext) {
7254
super(reactContext);
7355
mReactContext = reactContext;
74-
7556
_credentialsStore = OAuthManagerStore.getOAuthManagerStore(mReactContext, TAG, Context.MODE_PRIVATE);
7657
Log.d(TAG, "New instance");
7758
}
@@ -128,7 +109,7 @@ public void authorize(
128109
final OAuthManagerModule self = this;
129110
final HashMap<String,Object> cfg = this.getConfiguration(providerName);
130111
final String authVersion = (String) cfg.get("auth_version");
131-
Activity activity = mReactContext.getCurrentActivity();
112+
Activity activity = this.getCurrentActivity();
132113
FragmentManager fragmentManager = activity.getFragmentManager();
133114
String callbackUrl = "http://localhost/" + providerName;
134115

0 commit comments

Comments
 (0)