RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added native facebook authentication

Browse source 
[android] Implemented obtaining Facebook oauth token and passing it to the core
This commit is contained in:
Александр Зацепин 2017-09-28 19:36:23 +03:00 • committed by Arsentiy Milchakov
parent 851b67edbe
commit c3bd1ac79f
12 changed files with 376 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
android/AndroidManifest.xml
View file

@ -63,7 +63,7 @@
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/fb_app_id"/>
android:value="@string/facebook_app_id"/>
<meta-data
android:name="io.fabric.ApiKey"
@ -356,14 +356,7 @@
android:value="com.mapswithme.maps.MwmActivity"/>
</activity>
<!-- facebook -->
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize"
android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
<activity android:name="com.mopub.common.MoPubBrowser" android:configChanges="keyboardHidden|orientation|screenSize"/>
<!-- ugc -->
<activity
android:name=".ugc.UGCEditorActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
@ -374,6 +367,26 @@
android:value="com.mapswithme.maps.MwmActivity"/>
</activity>
<!-- facebook -->
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"/>
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="@string/fb_login_protocol_scheme"/>
</intent-filter>
</activity>
<activity android:name="com.mopub.common.MoPubBrowser" android:configChanges="keyboardHidden|orientation|screenSize"/>
<receiver
android:name="com.mapswithme.maps.background.ConnectivityChangedReceiver"
android:enabled="true"

6
android/build.gradle
View file

@ -40,6 +40,8 @@ dependencies {
compile 'com.android.support:cardview-v7:25.0.0'
compile 'com.android.support:preference-v7:25.0.0'
compile 'com.android.support:preference-v14:25.0.0'
compile 'com.android.support:customtabs:25.0.0'
// google play services
compile 'com.google.android.gms:play-services-location:10.0.1'
compile 'com.google.android.gms:play-services-analytics:10.0.1'
@ -52,7 +54,9 @@ dependencies {
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
compile('com.crashlytics.sdk.android:crashlytics-ndk:1.1.2@aar') { transitive = true }
// 3-party
compile 'com.facebook.android:facebook-android-sdk:4.8.0'
compile ('com.facebook.android:facebook-android-sdk:4.17.0') {
exclude group: 'com.android.support'
}
compile('com.facebook.android:audience-network-sdk:4.20.0') {
exclude group: 'com.google.android.gms'
exclude group: 'com.android.support'

40
android/res/layout/fragment_auth_passport_dialog.xml Normal file
View file

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="@dimen/margin_base_plus"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingEnd="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus"
android:paddingBottom="@dimen/auth_dialog_padding_bottom"
android:paddingTop="@dimen/auth_dialog_padding_top">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Headline"
android:text="Sign in with social"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/auth_dialog_padding_top"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:text="Easy sign in without login and password in a couple of seconds."
/>
<com.facebook.login.widget.LoginButton
xmlns:fb="http://schemas.android.com/apk/res-auto"
android:id="@+id/loging_button"
android:layout_width="match_parent"
android:layout_height="@dimen/auth_dialog_facebook_btn_height"
android:layout_marginTop="@dimen/auth_dialog_padding_top"
android:textSize="@dimen/text_size_body_3"
fb:com_facebook_login_text="@string/facebook"
android:paddingStart="@dimen/margin_base"
android:paddingLeft="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
android:layout_gravity="center_horizontal"/>
</LinearLayout>

2
android/res/layout/fragment_ugc_editor.xml
View file

@ -12,7 +12,7 @@
android:layout_height="?attr/actionBarSize"
android:theme="@style/MwmWidget.ToolbarTheme">
<ImageView
android:id="@+id/send"
android:id="@+id/submit"
android:layout_width="?actionBarSize"
android:layout_height="?actionBarSize"
android:layout_alignParentEnd="true"

5
android/res/values/dimens.xml
View file

@ -217,5 +217,10 @@
<dimen name="rating_view_background_radius">20dp</dimen>
<dimen name="rating_user_review_min_height">152dp</dimen>
<!-- Authorization-->
<dimen name="auth_dialog_padding_top">20dp</dimen>
<dimen name="auth_dialog_padding_bottom">28dp</dimen>
<dimen name="auth_dialog_facebook_btn_height">40dp</dimen>
<dimen name="divider_height">1dp</dimen>
</resources>

3
android/res/values/donottranslate.xml
View file

@ -3,7 +3,8 @@
<string name="shared_user_label" translatable="false">Maps With Me</string>
<!-- FB -->
<string name="fb_app_id" translatable="false">185237551520383</string>
<string name="facebook_app_id" translatable="false">185237551520383</string>
<string name="fb_login_protocol_scheme">fb185237551520383</string>
<!-- App names -->
<string name="facebook" translatable="false">Facebook</string>

112
android/src/com/mapswithme/maps/auth/BaseMwmAuthorizationFragment.java Normal file
View file

@ -0,0 +1,112 @@
package com.mapswithme.maps.auth;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.MainThread;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.View;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmToolbarFragment;
/**
* A base toolbar fragment which is responsible for the <b>authorization flow</b>,
* starting from the getting an auth token from a social network and passing it to the core
* to get user authorized for the MapsMe server (Passport).
*/
public abstract class BaseMwmAuthorizationFragment extends BaseMwmToolbarFragment
{
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
super.onViewCreated(view, savedInstanceState);
View submitButton = mToolbarController.findViewById(R.id.submit);
if (submitButton == null)
throw new AssertionError("Descendant of BaseMwmAuthorizationFragment must have authorize " +
"button in toolbar!");
submitButton.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
onSubmitButtonClick();
authorize();
}
});
}
private void authorize()
{
if (Framework.nativeIsUserAuthenticated())
{
onAuthorized();
return;
}
onPreSocialAuthentication();
String name = SocialAuthDialogFragment.class.getName();
DialogFragment fragment = (DialogFragment) Fragment.instantiate(getContext(), name);
fragment.setTargetFragment(this, Constants.REQ_CODE_GET_SOCIAL_TOKEN);
fragment.show(getActivity().getSupportFragmentManager(), name);
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == Activity.RESULT_OK && requestCode == Constants.REQ_CODE_GET_SOCIAL_TOKEN
&& data != null)
{
String socialToken = data.getStringExtra(Constants.EXTRA_SOCIAL_TOKEN);
if (!TextUtils.isEmpty(socialToken))
{
onStartAuthorization();
@Framework.SocialTokenType
int type = data.getIntExtra(Constants.EXTRA_TOKEN_TYPE, -1);
Framework.nativeAuthenticateUser(socialToken, type);
}
}
}
protected void onSubmitButtonClick()
{
}
/**
* A hook method that is called <b>before</b> the social authentication is started.
*/
@MainThread
protected void onPreSocialAuthentication()
{
}
/**
* A hook method that may be called in two cases:
* 1. User is already authorized for the MapsMe server.
* 2. User has been authorized for the MapsMe server at this moment.
*/
@MainThread
protected void onAuthorized()
{
}
/**
* Called <b>once after authorization</b> for the MapsMe server is started.
*/
@MainThread
protected void onStartAuthorization()
{
}
}

8
android/src/com/mapswithme/maps/auth/Constants.java Normal file
View file

@ -0,0 +1,8 @@
package com.mapswithme.maps.auth;
class Constants
{
static final int REQ_CODE_GET_SOCIAL_TOKEN = 101;
static final String EXTRA_SOCIAL_TOKEN = "extra_social_token";
static final String EXTRA_TOKEN_TYPE = "extra_token_type";
}

143
android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java Normal file
View file

@ -0,0 +1,143 @@
package com.mapswithme.maps.auth;
import android.app.Activity;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import com.facebook.AccessToken;
import com.facebook.CallbackManager;
import com.facebook.FacebookCallback;
import com.facebook.FacebookException;
import com.facebook.login.LoginResult;
import com.facebook.login.widget.LoginButton;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import java.lang.ref.WeakReference;
public class SocialAuthDialogFragment extends BaseMwmDialogFragment
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String TAG = SocialAuthDialogFragment.class.getSimpleName();
@NonNull
private final CallbackManager mCallbackManager = CallbackManager.Factory.create();
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
Dialog res = super.onCreateDialog(savedInstanceState);
res.requestWindowFeature(Window.FEATURE_NO_TITLE);
return res;
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
{
View view = inflater.inflate(R.layout.fragment_auth_passport_dialog, container, false);
LoginButton button = (LoginButton) view.findViewById(R.id.loging_button);
button.setReadPermissions("email");
button.setFragment(this);
button.registerCallback(mCallbackManager, new FBCallback(this));
return view;
}
@Override
public void onResume()
{
super.onResume();
AccessToken token = AccessToken.getCurrentAccessToken();
if (token == null)
return;
String tokenValue = token.getToken();
if (TextUtils.isEmpty(tokenValue))
return;
LOGGER.i(TAG, "Social token is already obtained");
sendResult(Activity.RESULT_OK, tokenValue, Framework.SOCIAL_TOKEN_FACEBOOK);
dismiss();
}
private void sendResult(int resultCode, @Nullable String socialToken,
@Framework.SocialTokenType int type)
{
Fragment caller = getTargetFragment();
Intent data = null;
if (caller != null)
{
if (resultCode == Activity.RESULT_OK)
{
data = new Intent();
data.putExtra(Constants.EXTRA_SOCIAL_TOKEN, socialToken);
data.putExtra(Constants.EXTRA_TOKEN_TYPE, type);
}
caller.onActivityResult(Constants.REQ_CODE_GET_SOCIAL_TOKEN, Activity.RESULT_OK, data);
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
mCallbackManager.onActivityResult(requestCode, resultCode, data);
}
private static class FBCallback implements FacebookCallback<LoginResult>
{
@NonNull
private final WeakReference<SocialAuthDialogFragment> mFragmentRef;
private FBCallback(@NonNull SocialAuthDialogFragment fragment)
{
mFragmentRef = new WeakReference<>(fragment);
}
@Override
public void onSuccess(LoginResult loginResult)
{
AccessToken accessToken = loginResult.getAccessToken();
LOGGER.d(TAG, "onSuccess, access token: " + accessToken + " permissions: "
+ loginResult.getRecentlyGrantedPermissions());
sendResult(Activity.RESULT_OK, accessToken.getToken(), Framework.SOCIAL_TOKEN_FACEBOOK);
}
@Override
public void onCancel()
{
LOGGER.w(TAG, "onCancel");
sendResult(Activity.RESULT_CANCELED, null, Framework.SOCIAL_TOKEN_FACEBOOK);
}
@Override
public void onError(FacebookException error)
{
LOGGER.e(TAG, "onError", error);
sendResult(Activity.RESULT_CANCELED, null, Framework.SOCIAL_TOKEN_FACEBOOK);
}
private void sendResult(int resultCode, @Nullable String socialToken,
@Framework.SocialTokenType int type)
{
SocialAuthDialogFragment fragment = mFragmentRef.get();
if (fragment == null)
return;
fragment.sendResult(resultCode, socialToken, type);
}
}
}

35
android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java
View file

@ -11,13 +11,17 @@ import android.view.View;
import android.view.ViewGroup;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmToolbarFragment;
import com.mapswithme.maps.auth.BaseMwmAuthorizationFragment;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
public class UGCEditorFragment extends BaseMwmToolbarFragment
public class UGCEditorFragment extends BaseMwmAuthorizationFragment
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String TAG = UGCEditorFragment.class.getSimpleName();
@NonNull
private final UGCRatingAdapter mUGCRatingAdapter = new UGCRatingAdapter();
@ -48,16 +52,25 @@ public class UGCEditorFragment extends BaseMwmToolbarFragment
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
super.onViewCreated(view, savedInstanceState);
View save = mToolbarController.findViewById(R.id.send);
save.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
getActivity().finish();
}
});
Intent intent = getActivity().getIntent();
mToolbarController.setTitle(intent.getStringExtra(UGCEditorActivity.EXTRA_TITLE));
}
@Override
protected void onPreSocialAuthentication()
{
LOGGER.i(TAG, "onPreSocialAuthentication()");
}
@Override
protected void onAuthorized()
{
LOGGER.i(TAG, "onAuthorized()");
}
@Override
protected void onStartAuthorization()
{
LOGGER.i(TAG, "onStartAuthorization()");
}
}

2
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -1353,7 +1353,7 @@ public class PlacePageView extends RelativeLayout
{
// TODO: Be careful, shouldShowUgc can return true only when all ui work about UGC is done.
// Now (01.08.2017) UI is not ready for UGC yet.
if (mMapObject.shouldShowUGC())
if (true)
{
UGC.setListener(this);
UGC.requestUGC(mMapObject.getFeatureId());

13
android/src/com/mapswithme/util/SecureStorage.java
View file

@ -3,24 +3,37 @@ package com.mapswithme.util;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
public final class SecureStorage
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String TAG = SecureStorage.class.getSimpleName();
private SecureStorage() {}
public static void save(@NonNull String key, @NonNull String value)
{
if (BuildConfig.DEBUG)
LOGGER.d(TAG, "save: key = " + key + ", value = " + value);
// TODO: implement @alexzatsepin
}
@Nullable
public static String load(@NonNull String key)
{
if (BuildConfig.DEBUG)
LOGGER.d(TAG, "load: key = " + key);
// TODO: implement @alexzatsepin
return null;
}
public static void remove(@NonNull String key)
{
if (BuildConfig.DEBUG)
LOGGER.d(TAG, "remove: key = " + key);
// TODO: implement @alexzatsepin
}
}