organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android] Fixed bug with bookmark sharing.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-08-07 18:47:46 +03:00 • committed by Alex Zolotarev
parent 34ec9d6c14
commit 094410e506
7 changed files with 35 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -396,8 +396,7 @@ public class MWMActivity extends BaseMwmFragmentActivity
final String geoUrl = Framework.nativeGetGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
final String httpUrl = Framework.getHttpGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
final String body = getString(R.string.my_position_share_sms, geoUrl, httpUrl);
// we use shortest message we can have here
ShareAction.AnyShareAction.share(this, body);
ShareAction.ANY_SHARE.share(this, body);
}
else
{

10
android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
View file

@ -131,10 +131,10 @@ public class BookmarksListFragment extends BaseMwmListFragment
.listener(this)
.build();
if (!ShareAction.getSmsShare().isSupported(getActivity()))
if (!ShareAction.SMS_SHARE.isSupported(getActivity()))
bs.getMenu().removeItem(R.id.share_message);
if (!ShareAction.getEmailShare().isSupported(getActivity()))
if (!ShareAction.EMAIL_SHARE.isSupported(getActivity()))
bs.getMenu().removeItem(R.id.share_email);
bs.show();
@ -167,15 +167,15 @@ public class BookmarksListFragment extends BaseMwmListFragment
switch (menuItem.getItemId())
{
case R.id.share_message:
ShareAction.getSmsShare().shareMapObject(getActivity(), item);
ShareAction.SMS_SHARE.shareMapObject(getActivity(), item);
break;
case R.id.share_email:
ShareAction.getEmailShare().shareMapObject(getActivity(), item);
ShareAction.EMAIL_SHARE.shareMapObject(getActivity(), item);
break;
case R.id.share:
ShareAction.getAnyShare().shareMapObject(getActivity(), item);
ShareAction.ANY_SHARE.shareMapObject(getActivity(), item);
break;
case R.id.edit:

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

@ -628,7 +628,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
break;
case R.id.rl__share:
AlohaHelper.logClick(AlohaHelper.PP_SHARE);
ShareAction.getAnyShare().shareMapObject((Activity) getContext(), mMapObject);
ShareAction.ANY_SHARE.shareMapObject((Activity) getContext(), mMapObject);
break;
case R.id.rl__api_back:
final Activity activity = (Activity) getContext();

5
android/src/com/mapswithme/util/sharing/BaseShareable.java
View file

@ -27,8 +27,7 @@ public abstract class BaseShareable
return mActivity;
}
protected void modifyIntent(Intent intent)
{}
protected void modifyIntent(Intent intent) {}
protected Intent getBaseIntent()
{
@ -42,7 +41,7 @@ public abstract class BaseShareable
if (!TextUtils.isEmpty(mText))
res.putExtra(Intent.EXTRA_TEXT, mText);
if (TextUtils.isEmpty(mSubject))
if (!TextUtils.isEmpty(mSubject))
res.putExtra(Intent.EXTRA_SUBJECT, mSubject);
String mime = getMimeType();

19
android/src/com/mapswithme/util/sharing/MapObjectShareable.java
View file

@ -17,14 +17,17 @@ public class MapObjectShareable extends BaseShareable
super(context);
mMapObject = mapObject;
String ge0Url = Framework.nativeGetGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getName());
String httpUrl = Framework.getHttpGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getName());
String address = Framework.nativeGetNameAndAddress4Point(mMapObject.getLat(), mMapObject.getLon());
int resId = mMapObject.getType() == MapObject.MapObjectType.MY_POSITION ? R.string.my_position_share_email
: R.string.my_position_share_email_subject;
setText(getActivity().getString(resId, address, ge0Url, httpUrl));
setSubject(getActivity().getString(mMapObject.getType() == MapObject.MapObjectType.MY_POSITION ? R.string.my_position_share_email_subject
: R.string.bookmark_share_email_subject));
final Activity activity = getActivity();
final String ge0Url = Framework.nativeGetGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getName());
final String httpUrl = Framework.getHttpGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getName());
final String address = Framework.nativeGetNameAndAddress4Point(mMapObject.getLat(), mMapObject.getLon());
final int textId = mMapObject.getType() == MapObject.MapObjectType.MY_POSITION ?
R.string.my_position_share_email : R.string.bookmark_share_email;
final int subjectId = mMapObject.getType() == MapObject.MapObjectType.MY_POSITION ?
R.string.my_position_share_email_subject : R.string.bookmark_share_email_subject;
setText(activity.getString(textId, address, ge0Url, httpUrl));
setSubject(activity.getString(subjectId));
}
@Override

85
android/src/com/mapswithme/util/sharing/ShareAction.java
View file

@ -1,12 +1,12 @@
package com.mapswithme.util.sharing;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.provider.Telephony;
import android.support.annotation.StringRes;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
@ -15,57 +15,26 @@ import com.mapswithme.maps.bookmarks.data.MapObject.MapObjectType;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
import java.util.HashMap;
import java.util.Map;
public abstract class ShareAction
{
public final static int ID_SMS = 0xfff1;
public final static int ID_EMAIL = 0xfff2;
public final static int ID_ANY = 0xffff;
public static final SmsShareAction SMS_SHARE = new SmsShareAction();
public static final EmailShareAction EMAIL_SHARE = new EmailShareAction();
public static final AnyShareAction ANY_SHARE = new AnyShareAction();
@SuppressLint("UseSparseArrays")
public final static Map<Integer, ShareAction> ACTIONS = new HashMap<>();
/* Actions*/
private final static SmsShareAction SMS_SHARE = new SmsShareAction();
private final static EmailShareAction EMAIL_SHARE = new EmailShareAction();
private final static AnyShareAction ANY_SHARE = new AnyShareAction();
/* Extras*/
private static final String EXTRA_SMS_BODY = "sms_body";
private static final String EXTRA_SMS_TEXT = Intent.EXTRA_TEXT;
protected static final String TYPE_MESSAGE_RFC822 = "message/rfc822";
protected static final String TYPE_TEXT_PLAIN = "text/plain";
/* Types*/
private static final String TYPE_MESSAGE_RFC822 = "message/rfc822";
private static final String TYPE_TEXT_PLAIN = "text/plain";
/* URIs*/
private static final String URI_STRING_SMS = "sms:";
protected final int mId;
@StringRes
protected final int mNameResId;
protected final Intent mBaseIntent;
public static SmsShareAction getSmsShare()
protected ShareAction(int nameResId, Intent baseIntent)
{
return SMS_SHARE;
}
public static EmailShareAction getEmailShare()
{
return EMAIL_SHARE;
}
public static AnyShareAction getAnyShare()
{
return ANY_SHARE;
}
protected ShareAction(int id, int nameResId, Intent baseIntent)
{
mId = id;
mNameResId = nameResId;
mBaseIntent = baseIntent;
}
@ -75,35 +44,22 @@ public abstract class ShareAction
return new Intent(mBaseIntent);
}
public int getId()
{
return mId;
}
public boolean isSupported(Context context)
{
return Utils.isIntentSupported(context, getIntent());
}
/**
* BASE share method
*/
public void shareMapObject(Activity activity, MapObject mapObject)
{
SharingHelper.shareOutside(new MapObjectShareable(activity, mapObject)
.setBaseIntent(new Intent(mBaseIntent)),
mNameResId);
.setBaseIntent(new Intent(mBaseIntent)), mNameResId);
}
/**
* SMS
*/
public static class SmsShareAction extends ShareAction
{
protected SmsShareAction()
{
super(ID_SMS, R.string.share_by_message, new Intent(Intent.ACTION_VIEW).setData(Uri.parse(URI_STRING_SMS)));
super(R.string.share_by_message, new Intent(Intent.ACTION_VIEW).setData(Uri.parse(URI_STRING_SMS)));
}
public void shareWithText(Activity activity, String body)
@ -113,7 +69,7 @@ public abstract class ShareAction
{
final String defaultSms = Telephony.Sms.getDefaultSmsPackage(activity);
smsIntent = new Intent(Intent.ACTION_SEND);
smsIntent.setType("text/plain");
smsIntent.setType(TYPE_TEXT_PLAIN);
smsIntent.putExtra(EXTRA_SMS_TEXT, body);
if (defaultSms != null)
smsIntent.setPackage(defaultSms);
@ -142,37 +98,24 @@ public abstract class ShareAction
}
}
/**
* EMAIL
*/
public static class EmailShareAction extends ShareAction
{
protected EmailShareAction()
{
super(ID_EMAIL, R.string.share_by_email, new Intent(Intent.ACTION_SEND).setType(TYPE_MESSAGE_RFC822));
super(R.string.share_by_email, new Intent(Intent.ACTION_SEND).setType(TYPE_MESSAGE_RFC822));
}
}
/**
* ANYTHING
*/
public static class AnyShareAction extends ShareAction
{
protected AnyShareAction()
{
super(ID_ANY, R.string.share, new Intent(Intent.ACTION_SEND).setType(TYPE_TEXT_PLAIN));
super(R.string.share, new Intent(Intent.ACTION_SEND).setType(TYPE_TEXT_PLAIN));
}
public static void share(final Activity activity, final String body)
public void share(final Activity activity, final String body)
{
SharingHelper.shareOutside(new TextShareable(activity, body));
}
}
static
{
ACTIONS.put(ID_ANY, getAnyShare());
ACTIONS.put(ID_EMAIL, getEmailShare());
ACTIONS.put(ID_SMS, getSmsShare());
}
}

3
android/src/com/mapswithme/util/sharing/TextShareable.java
View file

@ -4,7 +4,6 @@ import android.app.Activity;
public class TextShareable extends BaseShareable
{
public TextShareable(Activity context)
{
super(context);
@ -19,6 +18,6 @@ public class TextShareable extends BaseShareable
@Override
public String getMimeType()
{
return "text/plain";
return ShareAction.TYPE_TEXT_PLAIN;
}
}