Added slack and fixed response

Author: auser

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

@@ -11,6 +11,7 @@
 import android.annotation.SuppressLint;
 import android.widget.LinearLayout;
 import android.view.Gravity;
+import android.os.Build;
 
 import android.app.DialogFragment;
 import android.content.DialogInterface;
@@ -25,6 +26,9 @@
 import android.view.ViewGroup.LayoutParams;
 import android.content.Context;
 import android.util.DisplayMetrics;
+import android.view.Display;
+import java.lang.reflect.Method;
+import android.view.WindowManager;
 
 import com.github.scribejava.core.model.OAuth1AccessToken;
 import com.github.scribejava.core.model.OAuth1RequestToken;
@@ -33,6 +37,7 @@
 import android.os.Bundle;
 import android.app.Fragment;
 import java.io.IOException;
+import com.facebook.react.bridge.ReactContext;
 
 public class OAuthManagerDialogFragment extends DialogFragment implements AdvancedWebView.Listener {
 
@@ -42,52 +47,72 @@ public class OAuthManagerDialogFragment extends DialogFragment implements Advanc
     private static final String TAG = "OAuthManagerDialogFragment";
     private OAuthManagerFragmentController mController;
 
+    private ReactContext mReactContext;
     private AdvancedWebView mWebView;
 
     public static final OAuthManagerDialogFragment newInstance(
+      final ReactContext reactContext,
       OAuthManagerFragmentController controller
     ) {
       Bundle args = new Bundle();
       OAuthManagerDialogFragment frag =
-        new OAuthManagerDialogFragment(controller);
+        new OAuthManagerDialogFragment(reactContext, controller);
 
       return frag;
     }
 
     public OAuthManagerDialogFragment(
+      final ReactContext reactContext,
       OAuthManagerFragmentController controller
     ) {
       this.mController = controller;
+      this.mReactContext = reactContext;
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // View rootView = inflater.inflate(R.id.primary, container, false);
-        final Context context = inflater.getContext();
+        // final Context context = inflater.getContext();
         // DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        // final int DIALOG_HEIGHT = (int) Math.min(0.8f * metrics.heightPixels, 1024);
+        // final int DIALOG_HEIGHT = (int) Math.min(0.99f * metrics.heightPixels, 1024);
+
+        // LayoutParams rootViewLayoutParams = new LayoutParams(
+        //   LayoutParams.FILL_PARENT, 
+        //   LayoutParams.FILL_PARENT
+        // );
+        final Context context = mReactContext;
+        LayoutParams rootViewLayoutParams = this.getFullscreenLayoutParams(context);
 
         FrameLayout rootView = new FrameLayout(context);
         getDialog().setCanceledOnTouchOutside(true);
-        rootView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+        rootView.setLayoutParams(rootViewLayoutParams);
 
         // mWebView = (AdvancedWebView) rootView.findViewById(R.id.webview);
         Log.d(TAG, "Creating webview");
         mWebView = new AdvancedWebView(context);
         mWebView.setId(WEBVIEW_TAG);
         mWebView.setListener(this, this);
         mWebView.setVisibility(View.VISIBLE);
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.getSettings().setDomStorageEnabled(true);
+
+        LayoutParams layoutParams = this.getFullscreenLayoutParams(context);
+        //new LayoutParams(
+        //   LayoutParams.FILL_PARENT, 
+        //   DIALOG_HEIGHT
+        // );
+        // mWebView.setLayoutParams(layoutParams);
 
-        rootView.addView(mWebView, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+        rootView.addView(mWebView, layoutParams);
 
-        LinearLayout pframe = new LinearLayout(context);
-        pframe.setId(WIDGET_TAG);
-        pframe.setOrientation(LinearLayout.VERTICAL);
-        pframe.setVisibility(View.GONE);
-        pframe.setGravity(Gravity.CENTER);
+        // LinearLayout pframe = new LinearLayout(context);
+        // pframe.setId(WIDGET_TAG);
+        // pframe.setOrientation(LinearLayout.VERTICAL);
+        // pframe.setVisibility(View.GONE);
+        // pframe.setGravity(Gravity.CENTER);
+        // pframe.setLayoutParams(layoutParams);
 
-        rootView.addView(pframe,
-          new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+        // rootView.addView(pframe, layoutParams);
 
         this.setupWebView(mWebView);
         mController.getRequestTokenUrlAndLoad(mWebView);
@@ -96,12 +121,49 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         return rootView;
     }
 
+    private LayoutParams getFullscreenLayoutParams(Context context) {
+      WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+      // DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+      Display display = wm.getDefaultDisplay();
+      int realWidth;
+      int realHeight;
+
+      if (Build.VERSION.SDK_INT >= 17){
+          //new pleasant way to get real metrics
+          DisplayMetrics realMetrics = new DisplayMetrics();
+          display.getRealMetrics(realMetrics);
+          realWidth = realMetrics.widthPixels;
+          realHeight = realMetrics.heightPixels;
+
+      } else if (Build.VERSION.SDK_INT >= 14) {
+          //reflection for this weird in-between time
+          try {
+              Method mGetRawH = Display.class.getMethod("getRawHeight");
+              Method mGetRawW = Display.class.getMethod("getRawWidth");
+              realWidth = (Integer) mGetRawW.invoke(display);
+              realHeight = (Integer) mGetRawH.invoke(display);
+          } catch (Exception e) {
+              //this may not be 100% accurate, but it's all we've got
+              realWidth = display.getWidth();
+              realHeight = display.getHeight();
+              Log.e("Display Info", "Couldn't use reflection to get the real display metrics.");
+          }
+
+      } else {
+          //This should be close, as lower API devices should not have window navigation bars
+          realWidth = display.getWidth();
+          realHeight = display.getHeight();
+      }
+
+      return new LayoutParams(realWidth, realHeight);
+    }
+
+
     private void setupWebView(AdvancedWebView webView) {
       webView.setWebViewClient(new WebViewClient() {
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
-          interceptUrl(view, url, true);
-          return true;
+          return interceptUrl(view, url, true);
         }
 
         @Override
@@ -112,6 +174,7 @@ public void onReceivedError(WebView view, int code, String desc, String failingU
         }
 
         private boolean interceptUrl(WebView view, String url, boolean loadUrl) {
+          Log.i(TAG, "interceptUrl called with url: " + url);
           if (isCallbackUri(url, mController.getCallbackUrl())) {
             mController.getAccessToken(mWebView, url);
 
@@ -192,6 +255,7 @@ public void onPageStarted(String url, Bitmap favicon) {
     @Override
     public void onPageFinished(String url) {
       Log.d(TAG, "onPageFinished: " + url);
+      // mController.onComplete(url);
     }
 
     @Override

android/src/main/java/io/fullstack/oauth/OAuthManagerFragmentController.java

@@ -8,6 +8,7 @@
 import android.text.TextUtils;
 import im.delight.android.webview.AdvancedWebView;
 
+import com.facebook.react.bridge.ReactContext;
 import android.net.Uri;
 import android.util.Log;
 import android.view.View;
@@ -40,12 +41,15 @@ public class OAuthManagerFragmentController {
   private final android.app.FragmentManager fragmentManager;
   private final Handler uiHandler;
 
+  private ReactContext context;
+  private String providerName;
   private String authVersion;
   private OAuth10aService oauth10aService;
   private OAuth20Service oauth20Service;
   private String callbackUrl;
   private OAuth1RequestToken oauth1RequestToken;
   private HashMap<String,Object> mCfg;
+  private AdvancedWebView mWebView;
 
   private Runnable onAccessToken;
   private OAuthManagerOnAccessTokenListener mListener;
@@ -55,6 +59,7 @@ private void runOnMainThread(Runnable runnable) {
   }
 
   public OAuthManagerFragmentController(
+    final ReactContext mReactContext,
     android.app.FragmentManager fragmentManager,
     final String providerName,
     OAuth10aService oauthService,
@@ -63,12 +68,15 @@ public OAuthManagerFragmentController(
     this.uiHandler = new Handler(Looper.getMainLooper());
     this.fragmentManager = fragmentManager;
 
+    this.context = mReactContext;
+    this.providerName = providerName;
     this.authVersion = "1.0";
     this.oauth10aService = oauthService;
     this.callbackUrl = callbackUrl;
   }
 
   public OAuthManagerFragmentController(
+    final ReactContext mReactContext,
     android.app.FragmentManager fragmentManager,
     final String providerName,
     OAuth20Service oauthService,
@@ -77,6 +85,8 @@ public OAuthManagerFragmentController(
     this.uiHandler = new Handler(Looper.getMainLooper());
     this.fragmentManager = fragmentManager;
 
+    this.context = mReactContext;
+    this.providerName = providerName;
     this.authVersion = "2.0";
     this.oauth20Service = oauthService;
     this.callbackUrl = callbackUrl;
@@ -107,7 +117,7 @@ public void run() {
 
         Log.d(TAG, "Creating new Fragment");
         OAuthManagerDialogFragment frag = 
-          OAuthManagerDialogFragment.newInstance(OAuthManagerFragmentController.this);
+          OAuthManagerDialogFragment.newInstance(context, OAuthManagerFragmentController.this);
 
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
         ft.add(frag, TAG);
@@ -141,22 +151,34 @@ public void loaded10aAccessToken(final OAuth1AccessToken accessToken) {
     Log.d(TAG, "Loaded access token in OAuthManagerFragmentController");
     Log.d(TAG, "AccessToken: " + accessToken + " (raw: " + accessToken.getRawResponse() + ")");
 
+    mWebView = null;
     this.dismissDialog();
     mListener.onOAuth1AccessToken(accessToken);
   }
 
   public void loaded20AccessToken(final OAuth2AccessToken accessToken) {
+    mWebView = null;
     this.dismissDialog();
     mListener.onOAuth2AccessToken(accessToken);
   }
 
+  public void onComplete(String url) {
+    Log.d(TAG, "onComplete called in fragment controller " + url);
+    // if (mWebView != null) {
+    //   this.getAccessToken(mWebView, url);
+    // } else {
+      // this.dismissDialog();
+    // }
+  }
+
   public void onError(int errorCode, String description, String failingUrl) {
     Log.e(TAG, "Error in OAuthManagerFragmentController: " + description);
     this.dismissDialog();
     mListener.onRequestTokenError(new Exception(description));
   }
 
   public void getRequestTokenUrlAndLoad(AdvancedWebView webView) {
+    mWebView = webView;
     LoadRequestTokenTask task = new LoadRequestTokenTask(this, webView);
     task.execute();
   }
@@ -174,9 +196,15 @@ public void getAccessToken(
       task.execute();
     } else if (authVersion.equals("2.0")) {
       String code = responseUri.getQueryParameter("code");
-      Load2AccessTokenTask task = new Load2AccessTokenTask(
-        this, webView, code);
-      task.execute();
+      Log.d(TAG, "Called getAccessToken with code: " + code + " at " + url);
+      if (code != null) {
+        Load2AccessTokenTask task = new Load2AccessTokenTask(
+          this, webView, code);
+        task.execute();
+      } else {
+        this.dismissDialog();
+        mListener.onRequestTokenError(new Exception("No token found"));
+      }
     }
   }