Skip to content

Commit ad40014

Browse files
author
oleg
committed
Merge branch 'master' into LoginWithSocialNetworkSDK
# Conflicts: # out/backendless.jar # samples/UserService/FacebookSDKSamples/login/libs/backendless.jar
2 parents 3081978 + 1054177 commit ad40014

File tree

11 files changed

+96
-21
lines changed

11 files changed

+96
-21
lines changed

‎samples/DataService/tododemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/EndlessMatchMaker/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/EndlessTagging/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/FenceDemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/GeoService/geodemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/MessagingService/pubsubdemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/MessagingService/pushdemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/UserService/rolesdemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎samples/UserService/userservicedemo/libs/backendless.jar‎

1.41 KB
Binary file not shown.

‎src/com/backendless/UserService.java‎

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232
import com.facebook.CallbackManager;
3333
import weborb.types.Types;
3434

35-
import java.util.*;
35+
import java.util.ArrayList;
36+
import java.util.Arrays;
37+
import java.util.HashMap;
38+
import java.util.List;
39+
import java.util.Map;
3640

3741
public final class UserService
3842
{
@@ -248,24 +252,47 @@ public void handleFault( BackendlessFault fault )
248252
}
249253
}
250254

255+
public void loginWithFacebookSdk( String accessToken, final Map<String, String> fieldsMappings, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
256+
{
257+
AsyncCallback<BackendlessUser> internalResponder = getUserLoginAsyncHandler(responder, stayLoggedIn);
258+
getUserServiceAndroidExtra().loginWithFacebookSdk(accessToken, fieldsMappings, internalResponder);
259+
}
260+
261+
public void loginWithFacebookSdk( String accessToken, final Map<String, String> fieldsMappings, final AsyncCallback<BackendlessUser> responder)
262+
{
263+
loginWithFacebookSdk( accessToken, fieldsMappings, responder, false );
264+
}
265+
public void loginWithFacebookSdk( String accessToken, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn)
266+
{
267+
loginWithFacebookSdk( accessToken, null, responder, stayLoggedIn );
268+
}
269+
public void loginWithFacebookSdk( String accessToken, final AsyncCallback<BackendlessUser> responder)
270+
{
271+
loginWithFacebookSdk( accessToken, null, responder, false );
272+
}
273+
274+
@Deprecated
251275
public void loginWithFacebookSdk( android.app.Activity context, CallbackManager callbackManager, final AsyncCallback<BackendlessUser> responder )
252276
{
253277
loginWithFacebookSdk(context, callbackManager, responder, false );
254278
}
255279

280+
@Deprecated
256281
public void loginWithFacebookSdk( android.app.Activity context, CallbackManager callbackManager, final
257282
AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
258283
{
259284
AsyncCallback<BackendlessUser> internalResponder = getUserLoginAsyncHandler( responder, stayLoggedIn );
260285
getUserServiceAndroidExtra().loginWithFacebookSdk( context, callbackManager, internalResponder );
261286
}
262287

288+
@Deprecated
263289
public void loginWithFacebookSdk( android.app.Activity context, final Map<String, String> facebookFieldsMappings,
264290
final List<String> permissions, CallbackManager callbackManager, final AsyncCallback<BackendlessUser> responder )
265291
{
266292
loginWithFacebookSdk( context, facebookFieldsMappings, permissions, callbackManager, responder, false );
267293
}
268294

295+
@Deprecated
269296
public void loginWithFacebookSdk( android.app.Activity context, final Map<String, String> facebookFieldsMappings,
270297
final List<String> permissions, CallbackManager callbackManager, final
271298
AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
@@ -275,30 +302,35 @@ public void loginWithFacebookSdk( android.app.Activity context, final Map<String
275302
internalResponder );
276303
}
277304

305+
@Deprecated
278306
public void loginWithFacebook( android.app.Activity context, final AsyncCallback<BackendlessUser> responder )
279307
{
280308
loginWithFacebook( context, null, null, null, responder );
281309
}
282310

311+
@Deprecated
283312
public void loginWithFacebook( android.app.Activity context, android.webkit.WebView webView,
284313
final AsyncCallback<BackendlessUser> responder )
285314
{
286315
loginWithFacebook( context, webView, null, null, responder );
287316
}
288317

318+
@Deprecated
289319
public void loginWithFacebook( android.app.Activity context, android.webkit.WebView webView,
290320
final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
291321
{
292322
loginWithFacebook( context, webView, null, null, responder, stayLoggedIn );
293323
}
294324

325+
@Deprecated
295326
public void loginWithFacebook( android.app.Activity context, android.webkit.WebView webView,
296327
Map<String, String> facebookFieldsMappings, List<String> permissions,
297328
final AsyncCallback<BackendlessUser> responder )
298329
{
299330
loginWithFacebook( context, webView, facebookFieldsMappings, permissions, responder, false );
300331
}
301332

333+
@Deprecated
302334
public void loginWithFacebook( android.app.Activity context, android.webkit.WebView webView,
303335
Map<String, String> facebookFieldsMappings, List<String> permissions,
304336
final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
@@ -354,58 +386,79 @@ public void loginWithTwitter( android.app.Activity context, android.webkit.WebVi
354386
getUserServiceAndroidExtra().loginWithTwitter( context, webView, twitterFieldsMappings, getUserLoginAsyncHandler( responder, stayLoggedIn ) );
355387
}
356388

389+
@Deprecated
357390
public void loginWithGooglePlus( android.app.Activity context, final AsyncCallback<BackendlessUser> responder )
358391
{
359392
loginWithGooglePlus( context, null, null, null, responder );
360393
}
361394

395+
@Deprecated
362396
public void loginWithGooglePlus( android.app.Activity context, android.webkit.WebView webView,
363397
final AsyncCallback<BackendlessUser> responder )
364398
{
365399
loginWithGooglePlus( context, webView, null, null, responder );
366400
}
367401

402+
@Deprecated
368403
public void loginWithGooglePlus( android.app.Activity context, android.webkit.WebView webView,
369404
final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
370405
{
371406
loginWithGooglePlus( context, webView, null, null, responder, stayLoggedIn );
372407
}
373408

409+
@Deprecated
374410
public void loginWithGooglePlus( android.app.Activity context, android.webkit.WebView webView,
375411
Map<String, String> googlePlusFieldsMappings, List<String> permissions,
376412
final AsyncCallback<BackendlessUser> responder )
377413
{
378414
loginWithGooglePlus( context, webView, googlePlusFieldsMappings, permissions, responder, false );
379415
}
380416

417+
@Deprecated
381418
public void loginWithGooglePlus( android.app.Activity context, android.webkit.WebView webView,
382419
Map<String, String> googlePlusFieldsMappings, List<String> permissions,
383420
final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
384421
{
385422
getUserServiceAndroidExtra().loginWithGooglePlus( context, webView, googlePlusFieldsMappings, permissions, getUserLoginAsyncHandler( responder, stayLoggedIn ) );
386423
}
387424

388-
public void loginWithGooglePlusSdk( String tokenId, String accessToken, final AsyncCallback<BackendlessUser> responder )
389-
{
390-
loginWithGooglePlusSdk( tokenId, accessToken, null, null, responder );
425+
@Deprecated
426+
public void loginWithGooglePlusSdk( String tokenId, String accessToken, final AsyncCallback<BackendlessUser> responder ) {
427+
loginWithGooglePlusSdk(accessToken, (Map<String, String>) null, responder, false);
391428
}
392429

393-
public void loginWithGooglePlusSdk( String tokenId, String accessToken, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
394-
{
395-
loginWithGooglePlusSdk( tokenId, accessToken, null, null, responder, stayLoggedIn );
430+
@Deprecated
431+
public void loginWithGooglePlusSdk( String tokenId, String accessToken, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn ) {
432+
loginWithGooglePlusSdk(accessToken, (Map<String, String>) null, responder, stayLoggedIn);
396433
}
397434

435+
@Deprecated
398436
public void loginWithGooglePlusSdk( String tokenId, String accessToken, final Map<String, String> fieldsMappings,
399-
List<String> permissions, final AsyncCallback<BackendlessUser> responder )
400-
{
401-
loginWithGooglePlusSdk( tokenId, accessToken, fieldsMappings, permissions, responder, false );
437+
List<String> permissions, final AsyncCallback<BackendlessUser> responder ) {
438+
loginWithGooglePlusSdk(accessToken, fieldsMappings, responder, false);
402439
}
403440

441+
@Deprecated
404442
public void loginWithGooglePlusSdk( String tokenId, String accessToken, final Map<String, String> fieldsMappings,
405-
List<String> permissions, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn )
406-
{
407-
AsyncCallback<BackendlessUser> internalResponder = getUserLoginAsyncHandler( responder, stayLoggedIn );
408-
getUserServiceAndroidExtra().loginWithGooglePlusSdk( tokenId, accessToken, fieldsMappings, permissions, internalResponder );
443+
List<String> permissions, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn ) {
444+
loginWithGooglePlusSdk(accessToken, fieldsMappings, responder, stayLoggedIn);
445+
}
446+
447+
public void loginWithGooglePlusSdk( String accessToken, final Map<String, String> fieldsMappings, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn) {
448+
AsyncCallback<BackendlessUser> internalResponder = getUserLoginAsyncHandler(responder, stayLoggedIn);
449+
getUserServiceAndroidExtra().loginWithGooglePlusSdk(accessToken, fieldsMappings, internalResponder);
450+
}
451+
452+
public void loginWithGooglePlusSdk( String accessToken, final Map<String, String> fieldsMappings, final AsyncCallback<BackendlessUser> responder) {
453+
loginWithGooglePlusSdk(accessToken, fieldsMappings, responder, false);
454+
}
455+
456+
public void loginWithGooglePlusSdk( String accessToken, final AsyncCallback<BackendlessUser> responder, boolean stayLoggedIn) {
457+
loginWithGooglePlusSdk(accessToken, (Map<String, String>) null, responder, stayLoggedIn);
458+
}
459+
460+
public void loginWithGooglePlusSdk( String accessToken, final AsyncCallback<BackendlessUser> responder) {
461+
loginWithGooglePlusSdk(accessToken, (Map<String, String>) null, responder, false);
409462
}
410463

411464
public void logout() throws BackendlessException

0 commit comments

Comments
 (0)