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

Fixes.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-11-27 21:43:04 +03:00 • committed by Alex Zolotarev
parent 797e5f4fc8
commit eca01efa0f
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
android/src/com/mapswithme/maps/background/Notifier.java
View file

@ -36,6 +36,7 @@ public class Notifier
private static final String EXTRA_CONTENT = "ExtraContent";
private static final String EXTRA_TITLE = "ExtraTitle";
private static final String EXTRA_INTENT = "ExtraIntent";
private static final String EXTRA_FORCE_PROMO_DIALOG = "ExtraForceDialog";
public static final String ACTION_NAME = "com.mapswithme.MYACTION";
private static IntentFilter mIntentFilter = new IntentFilter(ACTION_NAME);
@ -44,7 +45,10 @@ public class Notifier
@Override
public void onReceive(Context context, Intent intent)
{
showFreeLiteNotification(new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.PRO_URL)).putExtras(intent.getExtras()));
if (intent.getBooleanExtra(EXTRA_FORCE_PROMO_DIALOG, false))
showFreeProNotification(new Intent(context, MWMActivity.class).putExtras(intent.getExtras()));
else
showFreeLiteNotification(new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.PRO_URL)).putExtras(intent.getExtras()));
}
};
@ -168,9 +172,10 @@ public class Notifier
private static void cancelPromoNotifications()
{
final AlarmManager alarmManager = (AlarmManager) MWMApplication.get().getSystemService(Context.ALARM_SERVICE);
final MWMApplication application = MWMApplication.get();
final AlarmManager alarmManager = (AlarmManager) application.getSystemService(Context.ALARM_SERVICE);
final Intent it = new Intent(ACTION_NAME);
final PendingIntent pi = PendingIntent.getBroadcast(MWMApplication.get(), 0, it, PendingIntent.FLAG_UPDATE_CURRENT);
final PendingIntent pi = PendingIntent.getBroadcast(application, 0, it, PendingIntent.FLAG_UPDATE_CURRENT);
alarmManager.cancel(pi);
}
@ -216,15 +221,31 @@ public class Notifier
cancelPromoNotifications();
}
else
scheduleFreeProNotification(application.getString(R.string.free_pro_version_notification_pro), "");
scheduleFreeProNotification(application.getString(R.string.free_pro_version_notification_pro), "", calendar);
}
}
private static void scheduleFreeProNotification(String title, String content)
private static void scheduleFreeProNotification(String title, String content, Calendar calendar)
{
final MWMApplication application = MWMApplication.get();
application.registerReceiver(mAlarmReceiver, mIntentFilter);
final Intent it = new Intent(ACTION_NAME).
putExtra(EXTRA_TITLE, title).
putExtra(EXTRA_CONTENT, content).
putExtra(EXTRA_FORCE_PROMO_DIALOG, true);
final PendingIntent pi = PendingIntent.getBroadcast(application, 0, it, PendingIntent.FLAG_UPDATE_CURRENT);
final AlarmManager alarmManager = (AlarmManager) application.getSystemService(Context.ALARM_SERVICE);
alarmManager.set(AlarmManager.RTC, calendar.getTimeInMillis(), pi);
}
public static void showFreeProNotification(Intent intent)
{
final MWMApplication application = MWMApplication.get();
final PendingIntent pi = PendingIntent.getActivity(application, 0, new Intent(application, MWMActivity.class),
PendingIntent.FLAG_UPDATE_CURRENT);
final String title = intent.getStringExtra(EXTRA_TITLE);
final String content = intent.getStringExtra(EXTRA_CONTENT);
final Notification notification = getBuilder()
.setContentTitle(title)

8
android/src/com/mapswithme/util/ShareAction.java
View file

@ -247,15 +247,15 @@ public abstract class ShareAction
{
for (ResolveInfo info : resInfo)
{
if (info.activityInfo.packageName.contains("facebook") || info.activityInfo.packageName.contains("twitter") ||
info.activityInfo.packageName.contains("google") || info.activityInfo.packageName.contains("viber"))
if (info.activityInfo.packageName.toLowerCase().contains("facebook") || info.activityInfo.packageName.toLowerCase().contains("twitter") ||
info.activityInfo.packageName.toLowerCase().contains("google") || info.activityInfo.packageName.toLowerCase().contains("viber"))
{
final Intent copy = new Intent(intent);
copy.setComponent(new ComponentName(info.activityInfo.packageName, info.activityInfo.name));
if (info.activityInfo.packageName.toLowerCase().contains(Constants.Package.FB_PACKAGE))
{
copy.putExtra(Intent.EXTRA_TEXT, "http://maps.me/promo_banner");
copy.putExtra(Intent.EXTRA_SUBJECT, "http://masp.me/promo_banner");
copy.putExtra(Intent.EXTRA_TEXT, "http://maps.me/fb_share");
copy.putExtra(Intent.EXTRA_SUBJECT, "http://maps.me/fb_share");
}
targetedShareIntents.add(new LabeledIntent(copy, info.activityInfo.packageName,
info.loadLabel(activity.getPackageManager()), info.icon));