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

[and] Fixes

Browse source
This commit is contained in:
Dmitry Kunin 2013-08-28 20:26:38 +03:00 • committed by Alex Zolotarev
parent 8a40a8b1de
commit 006f01d897
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -278,6 +278,9 @@ public class DownloadResourcesActivity extends MapsWithMeBaseActivity
private void tryAdvertiseGuides()
{
if (!Utils.hasAnyGoogleStoreInstalled())
return;
final GuideInfo[] gInfos = Framework.getGuideInfosForDownloadedMaps();
if (gInfos == null)
return;

43
android/src/com/mapswithme/maps/DownloadUI.java
View file

@ -27,6 +27,7 @@ import com.mapswithme.maps.guides.GuideInfo;
import com.mapswithme.maps.guides.GuidesUtils;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
@ -131,6 +132,8 @@ public class DownloadUI extends MapsWithMeBaseListActivity implements MapStorage
private final String m_kb;
private final String m_mb;
private final boolean mHasGoogleStore;
private final AlertDialog.Builder m_alert;
private final DialogInterface.OnClickListener m_alertCancelHandler =
new DialogInterface.OnClickListener()
@ -156,6 +159,8 @@ public class DownloadUI extends MapsWithMeBaseListActivity implements MapStorage
m_alert = new AlertDialog.Builder(m_context);
mHasGoogleStore = Utils.hasAnyGoogleStoreInstalled();
fillList();
}
@ -560,24 +565,34 @@ public class DownloadUI extends MapsWithMeBaseListActivity implements MapStorage
setFlag(position, holder.mFlag);
}
final CountryItem item = getItem(position);
if (item.getType() == TYPE_COUNTRY_IN_PROCESS || item.getType() == TYPE_COUNTRY_READY)
{
final GuideInfo gi = MWMApplication.get().getGuideInfoForIndex(item.mIdx);
if (gi != null && !GuidesUtils.isGuideInstalled(gi.mAppId, m_context))
if (mHasGoogleStore)
{
UiUtils.hide(holder.mFlag);
UiUtils.show(holder.mGuide);
holder.mGuide.setImageResource(R.drawable.ic_guide);
holder.mGuide.setOnClickListener(new OnClickListener()
final CountryItem item = getItem(position);
if (item.getType() == TYPE_COUNTRY_IN_PROCESS || item.getType() == TYPE_COUNTRY_READY)
{
final GuideInfo gi = MWMApplication.get().getGuideInfoForIndex(item.mIdx);
if (gi != null)
{
@Override
public void onClick(View v)
UiUtils.hide(holder.mFlag);
UiUtils.show(holder.mGuide);
holder.mGuide.setImageResource(R.drawable.ic_guide);
holder.mGuide.setOnClickListener(new OnClickListener()
{
m_context.startActivity(GuidesUtils.getGoogleStoreIntentForPackage(gi.mAppId));
}
});
@Override
public void onClick(View v)
{
final String packName = gi.mAppId;
if (GuidesUtils.isGuideInstalled(packName, m_context))
{
final Intent i = m_context.getPackageManager().getLaunchIntentForPackage(packName);
m_context.startActivity(i);
}
else
m_context.startActivity(GuidesUtils.getGoogleStoreIntentForPackage(gi.mAppId));
}
});
}
}
}