Skip to content

Commit 84a3d25

Browse files
Merge remote-tracking branch 'teamOSC/signon'
Conflicts: app/build.gradle app/src/main/java/in/tosc/studddin/externalapi/FacebookApi.java app/src/main/java/in/tosc/studddin/fragments/people/ViewPerson.java
2 parents ddb96de + 96b272d commit 84a3d25

14 files changed

Lines changed: 180 additions & 140 deletions

app/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,18 @@ android {
3838
}
3939
}
4040

41+
repositories {
42+
mavenCentral()
43+
}
44+
4145
dependencies {
4246
compile fileTree(dir: 'libs', include: ['*.jar'])
4347
compile 'com.android.support:appcompat-v7:21.0.3'
4448
compile 'com.android.support:support-v4:21.0.3'
4549
compile 'com.android.support:recyclerview-v7:21.0.3'
4650
compile 'com.android.support:cardview-v7:21.0.3'
4751
compile 'com.parse.bolts:bolts-android:1.1.4'
48-
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
49-
//compile 'com.koushikdutta.ion:ion:2.0.5'
52+
compile 'com.facebook.android:facebook-android-sdk:4.0.0'
5053
compile 'com.facebook.fresco:fresco:0.4.0+'
5154
compile 'com.google.android.gms:play-services:6.5.87'
5255
compile 'com.android.support:palette-v7:21.0.0'

app/libs/Parse-1.8.2.jar

-819 KB
Binary file not shown.

app/libs/Parse-1.9.1.jar

878 KB
Binary file not shown.
8.27 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</intent-filter>
5151
</activity>
5252
<activity
53-
android:name="com.facebook.LoginActivity"
53+
android:name="com.facebook.FacebookActivity"
5454
android:label="@string/app_name"
5555
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
5656

app/src/main/java/in/tosc/studddin/ApplicationWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void onCreate() {
2626
Parse.initialize(this, "9nhyJ0OEkfqmGygl44OAYfdFdnapE27d9yj9UI5x", "7pJlc2KZgpFXZHwvoXwVeZUsEtiDoTrtjPM7EGBa");
2727
ParseUser.enableAutomaticUser();
2828
ParseACL defaultACL = new ParseACL();
29-
ParseFacebookUtils.initialize(getResources().getString(R.string.facebook_app_id));
29+
ParseFacebookUtils.initialize(this);
3030
ParseTwitterUtils.initialize("FfUOeQ5OBuv0qOkdHbfXCrwdk", "xQmFnUSii54eS3iUrl0uIrxfeL4EfIdFc6iyoHUDgSIVGDbauD");
3131
Fresco.initialize(this);
3232
}

app/src/main/java/in/tosc/studddin/NavigationDrawerFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
145145
//mDrawerListView.addFooterView(mDrawerLinearLayout);
146146

147147
mProfilePic = ((ParseCircularImageView) mDrawerLinearLayout.findViewById(R.id.nav_drawer_profile_pic));
148-
mProfilePic.setPlaceholder(getResources().getDrawable(R.drawable.com_facebook_profile_default_icon));
148+
mProfilePic.setPlaceholder(getResources().getDrawable(R.drawable.ic_launcher));
149149
mProfilePic.setParseFile(ParseUser.getCurrentUser().getParseFile(ParseTables.Users.IMAGE));
150150

151151
mCoverPic = ((ParseImageView) mDrawerLinearLayout.findViewById(R.id.nav_drawer_cover_picture));

app/src/main/java/in/tosc/studddin/SignOnActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
6464
{
6565
fragment.onActivityResult(requestCode, resultCode,data);
6666
}
67-
ParseFacebookUtils.finishAuthentication(requestCode, resultCode, data);
67+
// ParseFacebookUtils.finishAuthentication(requestCode, resultCode, data);
68+
ParseFacebookUtils.onActivityResult(requestCode, resultCode, data);
6869
}
6970
}

app/src/main/java/in/tosc/studddin/externalapi/FacebookApi.java

Lines changed: 36 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
import android.os.Bundle;
66
import android.util.Log;
77

8-
import com.facebook.HttpMethod;
9-
import com.facebook.Request;
10-
import com.facebook.Response;
11-
import com.facebook.Session;
12-
import com.facebook.model.GraphUser;
8+
import com.facebook.AccessToken;
9+
import com.facebook.GraphRequest;
10+
import com.facebook.GraphResponse;
1311

1412
import org.json.JSONArray;
1513
import org.json.JSONException;
@@ -26,39 +24,46 @@ public class FacebookApi {
2624
public static final boolean INFO = ApplicationWrapper.LOG_INFO;
2725
public static final String APP_ID = "903137443064438";
2826
private static final String TAG = "FacebookApi";
29-
public static String USER_ID = "";
30-
public static Bundle FbDataBundle = new Bundle();
31-
private static Session session;
3227

33-
public static void setSession(Session s) {
34-
session = s;
35-
}
28+
public static String PROFILE_URL = "";
29+
public static String COVER_URL = "";
3630

3731
public static void getFacebookData(final FbGotDataCallback fgdc) {
38-
Request.newMeRequest(session, new Request.GraphUserCallback() {
39-
@Override
40-
public void onCompleted(GraphUser gu, Response response) {
41-
if (gu != null) {
42-
if (DEBUG) Log.d(TAG, "json = " + response.getGraphObject().getInnerJSONObject().toString());
43-
JSONObject responseObject = response.getGraphObject().getInnerJSONObject();
44-
USER_ID = gu.getId();
45-
try {
46-
FbDataBundle.putString(ParseTables.Users.EMAIL, responseObject.getString("email"));
47-
FbDataBundle.putString(ParseTables.Users.NAME, gu.getName());
48-
FbDataBundle.putString(ParseTables.Users.USERNAME, gu.getUsername());
49-
FbDataBundle.putString(ParseTables.Users.CITY, "" + gu.getLocation().getLocation().getCity());
50-
} catch (Exception e) {
51-
// e.printStackTrace();
32+
33+
final Bundle b = new Bundle();
34+
GraphRequest request = GraphRequest.newMeRequest(
35+
AccessToken.getCurrentAccessToken(),
36+
new GraphRequest.GraphJSONObjectCallback() {
37+
@Override
38+
public void onCompleted(
39+
JSONObject object,
40+
GraphResponse response) {
41+
if (DEBUG) Log.d(TAG,"" +object.toString());
42+
try {
43+
if(!object.isNull("cover"))
44+
b.putString(ParseTables.Users.COVER,object.getJSONObject("cover").getString("source"));
45+
else
46+
b.putString(ParseTables.Users.COVER, "");
47+
String id = object.getString("id");
48+
b.putString(ParseTables.Users.IMAGE,"https://graph.facebook.com/" + id + "/picture??width=300&&height=300");
49+
b.putString(ParseTables.Users.NAME, object.getString("name"));
50+
b.putString(ParseTables.Users.EMAIL, object.getString("email"));
51+
52+
fgdc.gotData(b);
53+
} catch (JSONException e1) {
54+
e1.printStackTrace();
55+
}
5256
}
53-
FbDataBundle.putString(ParseTables.Users.DOB, gu.getBirthday());
54-
fgdc.gotData(FbDataBundle);
55-
}
56-
}
57-
}).executeAsync();
57+
});
58+
Bundle parameters = new Bundle();
59+
parameters.putString("fields", "name,id,cover,email,birthday");
60+
request.setParameters(parameters);
61+
request.executeAsync();
5862
return;
5963
}
6064

6165
public static void getFacebookUserEvents(final FbGotEventDataCallback fgedc) {
66+
/*
6267
Bundle bundle = new Bundle();
6368
bundle.putString("fields", "description,start_time,owner,name,cover");
6469
Request r = new Request(session, "/me/events", bundle,
@@ -73,58 +78,7 @@ public void onCompleted(Response response) {
7378
}
7479
}
7580
});
76-
r.executeAsync();
77-
}
78-
79-
public static void getProfilePicture(final FbGotProfilePictureCallback listener) {
80-
if (DEBUG) Log.d(TAG, "getting profile picture");
81-
Bundle bundle = new Bundle();
82-
bundle.putString("fields", "picture");
83-
new Request(session, "me", bundle,
84-
HttpMethod.GET, new Request.Callback() {
85-
@Override
86-
public void onCompleted(final Response response) {
87-
new AsyncTask<Void, Void, Void>() {
88-
@Override
89-
protected Void doInBackground(Void... params) {
90-
try {
91-
String objectId = response.getGraphObject().getInnerJSONObject().getString("id");
92-
String sUrl = "https://graph.facebook.com/" + objectId + "/picture??width=300&&height=300";
93-
Bitmap bitmap = Utilities.downloadBitmap(sUrl);
94-
listener.gotProfilePicture(bitmap);
95-
} catch (JSONException e) {
96-
e.printStackTrace();
97-
}
98-
return null;
99-
}
100-
}.execute();
101-
}
102-
}).executeAsync();
103-
}
104-
105-
public static void getCoverPicture(final FbGotCoverPictureCallback listener) {
106-
if (DEBUG) Log.d(TAG, "getting cover picture");
107-
Bundle bundle = new Bundle();
108-
bundle.putString("fields", "cover");
109-
new Request(session, "me", bundle,
110-
HttpMethod.GET, new Request.Callback() {
111-
@Override
112-
public void onCompleted(final Response response) {
113-
new AsyncTask<Void, Void, Void>() {
114-
@Override
115-
protected Void doInBackground(Void... params) {
116-
try {
117-
String sUrl = response.getGraphObject().getInnerJSONObject().getJSONObject("cover").getString("source");
118-
Bitmap bitmap = Utilities.downloadBitmap(sUrl);
119-
listener.gotCoverPicture(bitmap);
120-
} catch (JSONException e) {
121-
e.printStackTrace();
122-
}
123-
return null;
124-
}
125-
}.execute();
126-
}
127-
}).executeAsync();
81+
r.executeAsync();*/
12882
}
12983

13084
public interface FbGotDataCallback {

app/src/main/java/in/tosc/studddin/fragments/people/ViewPerson.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
import android.widget.LinearLayout;
1515
import android.widget.TextView;
1616

17-
import com.facebook.Request;
18-
import com.facebook.Response;
19-
import com.facebook.Session;
20-
import com.facebook.model.GraphUser;
17+
import com.parse.Parse;
2118
import com.parse.ParseFacebookUtils;
2219
import com.parse.ParseTwitterUtils;
2320

@@ -80,11 +77,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
8077

8178
if (susername.contains("@")) {
8279
mail.setVisibility(View.VISIBLE);
83-
}
84-
if (makeMeRequest(ParseFacebookUtils.getSession())) {
80+
}/*
81+
if(makeMeRequest(ParseFacebookUtils.getSession())){
8582
facebook.setVisibility(View.VISIBLE);
86-
}
87-
if (ParseTwitterUtils.getTwitter().getUserId() != null) {
83+
}*/
84+
if(ParseTwitterUtils.getTwitter().getUserId()!=null){
8885
twitter.setVisibility(View.VISIBLE);
8986
}
9087

@@ -165,7 +162,7 @@ public void onClick(View v) {
165162

166163
}
167164

168-
165+
/*
169166
private boolean makeMeRequest(final Session session) {
170167
Request request = Request.newMeRequest(session,
171168
new Request.GraphUserCallback() {
@@ -187,5 +184,5 @@ public void onCompleted(GraphUser user, Response response) {
187184
request.executeAsync();
188185
return false;
189186
}
190-
191-
}
187+
*/
188+
}

0 commit comments

Comments
 (0)