Skip to content
This repository was archived by the owner on Jun 2, 2023. It is now read-only.

Commit a5c6910

Browse files
committed
fix(android): return the auth response properly
1 parent 23020f9 commit a5c6910

File tree

6 files changed

+33
-44
lines changed

6 files changed

+33
-44
lines changed
Binary file not shown.

android/capacitor-twitter/src/main/java/cap/twitter/plugin/TwitterPlugin.java

+33-44
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.twitter.sdk.android.core.TwitterSession;
2424
import com.twitter.sdk.android.core.identity.TwitterAuthClient;
2525

26-
@NativePlugin()
26+
@NativePlugin(requestCodes = {140})
2727
public class TwitterPlugin extends Plugin {
2828
public static final String CONFIG_KEY_PREFIX = "plugins.TwitterPlugin.";
2929

@@ -43,38 +43,41 @@ public void load() {
4343
.build();
4444
Twitter.initialize(config);
4545

46+
47+
//this.bridge.onActivityResult(, , );
48+
4649
super.load();
4750
}
4851

4952

5053
@PluginMethod()
5154
public void login(final PluginCall call) {
52-
execute(new Runnable() {
55+
56+
Log.d("DEBUG", "LOGIN CALL");
57+
58+
authClient = new TwitterAuthClient();
59+
60+
authClient.authorize(getActivity(), new Callback<TwitterSession>() {
61+
@Override
62+
public void success(Result<TwitterSession> result) {
63+
Log.d("DEBUG", "LOGIN SUCCESS");
64+
JSObject ret = new JSObject();
65+
ret.put("authToken", result.data.getAuthToken().token);
66+
ret.put("authTokenSecret", result.data.getAuthToken().secret);
67+
ret.put("userName", result.data.getUserName());
68+
ret.put("userID", result.data.getUserId());
69+
Log.d("DEBUG", String.valueOf(ret));
70+
71+
call.success(ret); // this is never called =(
72+
}
73+
5374
@Override
54-
public void run() {
55-
Log.d("DEBUG", "LOGIN CALL");
56-
TwitterAuthClient authClient = new TwitterAuthClient();
57-
authClient.authorize(getActivity(), new Callback<TwitterSession>() {
58-
@Override
59-
public void success(Result<TwitterSession> result) {
60-
Log.d("DEBUG", "LOGIN SUCCESS");
61-
JSObject ret = new JSObject();
62-
ret.put("authToken", result.data.getAuthToken().token);
63-
ret.put("authTokenSecret", result.data.getAuthToken().secret);
64-
ret.put("userName", result.data.getUserName());
65-
ret.put("userID", result.data.getUserId());
66-
Log.d("DEBUG", String.valueOf(ret));
67-
68-
call.success(ret); // this is never called =(
69-
}
70-
@Override
71-
public void failure(TwitterException exception) {
72-
Log.d("DEBUG", "OH NO!! THERE WAS AN ERROR");
73-
call.error("error on auth", exception);
74-
}
75-
});
75+
public void failure(TwitterException exception) {
76+
Log.d("DEBUG", "OH NO!! THERE WAS AN ERROR");
77+
call.error("error on auth", exception);
7678
}
7779
});
80+
7881
}
7982

8083
@PluginMethod()
@@ -83,29 +86,15 @@ public void logout(PluginCall call) {
8386
call.success();
8487
}
8588

86-
// @Override
87-
// protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
88-
// super.handleOnActivityResult(requestCode, resultCode, data);
89-
// authClient.handleOnActivityResult(requestCode, resultCode, data);
90-
//// PluginCall savedCall = getSavedCall();
91-
////
92-
//// if (savedCall == null) {
93-
//// return;
94-
//// }
95-
//// if (requestCode == REQUEST_IMAGE_PICK) {
96-
//// // Do something with the data
97-
//// }
98-
// }
9989

10090
@Override
10191
protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
102-
103-
// Pass the activity result to the auth client.
104-
Log.d("DEBUG PLUGIN", String.valueOf(data));
105-
106-
// authClient.onActivityResult(requestCode, resultCode, data);
107-
108-
super.handleOnActivityResult(requestCode, resultCode, data);
92+
93+
if (requestCode == 140) {
94+
authClient.onActivityResult(requestCode, resultCode, data);
95+
} else {
96+
super.handleOnActivityResult(requestCode, resultCode, data);
97+
}
10998

11099
}
111100

0 commit comments

Comments
 (0)