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

MRGS config fix

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-12-26 15:47:26 +03:00 • committed by Alex Zolotarev
parent 060c29147b
commit f133418d10
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/build.gradle
View file

@ -58,7 +58,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"googleplay@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'false'
android.sourceSets.googlePro.setRoot('flavors/pro')
android.sourceSets.googlePro.assets.srcDirs = ['flavors/guides-assets']
android.sourceSets.googlePro.assets.srcDirs = ['flavors/guides-assets', 'flavors/pro/assets']
}
googleLite {
@ -80,7 +80,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"samsung@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'false'
android.sourceSets.samsungPro.setRoot('flavors/pro')
android.sourceSets.samsungPro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets']
android.sourceSets.samsungPro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
samsungLite {
@ -103,7 +103,7 @@ android {
buildConfigField 'boolean', 'IS_PREINSTALLED', 'false'
android.sourceSets.amazonPro.setRoot('flavors/pro')
// Do not include guides assets for Amazon, they don't like GP apps ads
android.sourceSets.amazonPro.assets.srcDirs = ['flavors/mwm-ttf-assets']
android.sourceSets.amazonPro.assets.srcDirs = ['flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
amazonLite {
@ -126,7 +126,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"android@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'false'
android.sourceSets.androidpitPro.setRoot('flavors/pro')
android.sourceSets.androidpitPro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets']
android.sourceSets.androidpitPro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
androidpitLite {
@ -148,7 +148,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"android@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'false'
android.sourceSets.slidemePro.setRoot('flavors/pro')
android.sourceSets.slidemePro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets']
android.sourceSets.slidemePro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
slidemeLite {
@ -170,7 +170,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"android@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'false'
android.sourceSets.yandexPro.setRoot('flavors/pro')
android.sourceSets.yandexPro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets']
android.sourceSets.yandexPro.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
yandexLite {
@ -203,7 +203,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"googleplay@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'true'
android.sourceSets.prestigio.setRoot('flavors/pro')
android.sourceSets.prestigio.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets']
android.sourceSets.prestigio.assets.srcDirs = ['flavors/guides-assets', 'flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
cipherlab {
@ -214,7 +214,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"support@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'true'
android.sourceSets.cipherlab.setRoot('flavors/pro')
android.sourceSets.cipherlab.assets.srcDirs = ['flavors/mwm-ttf-assets']
android.sourceSets.cipherlab.assets.srcDirs = ['flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
xiaomi {
@ -225,7 +225,7 @@ android {
buildConfigField 'String', 'SUPPORT_MAIL', '"support@maps.me"'
buildConfigField 'boolean', 'IS_PREINSTALLED', 'true'
android.sourceSets.xiaomi.setRoot('flavors/pro')
android.sourceSets.xiaomi.assets.srcDirs = ['flavors/mwm-ttf-assets']
android.sourceSets.xiaomi.assets.srcDirs = ['flavors/mwm-ttf-assets', 'flavors/pro/assets']
}
}

5
android/src/com/mapswithme/maps/MWMApplication.java
View file

@ -3,6 +3,7 @@ package com.mapswithme.maps;
import android.app.Activity;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.util.Log;
@ -145,6 +146,8 @@ public class MWMApplication extends android.app.Application implements ActiveCou
private void initMrgs()
{
MRGService.setAppContext(this);
final Bundle options = new Bundle();
options.putBoolean("locations", false);
MRGService.service(this, new MRGSServerData.MRGSServerDataDelegate()
{
@Override
@ -152,7 +155,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
@Override
public void loadPromoBannersDidFinished(MRGSMap mrgsMap) {}
}, getString(R.string.mrgs_id), getString(R.string.mrgs_key));
}, getString(R.string.mrgs_id), getString(R.string.mrgs_key), options);
if (getLaunchesNumber() == 1)
MRGSApplication.instance().markAsUpdated(new Date());