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

Removed MRGS.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-05-15 18:33:53 +03:00 • committed by Alex Zolotarev
parent 4903ef8798
commit a65c206d07
9 changed files with 5 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/3rd_party/AF-Android-SDK-v2.3.1.13.jar vendored
View file

Binary file not shown.

BIN
android/3rd_party/MRGService-no-inapp.jar vendored
View file

Binary file not shown.

BIN
android/3rd_party/mrgsmanifest.jar vendored
View file

Binary file not shown.

28
android/AndroidManifest.xml
View file

@ -240,34 +240,6 @@
android:exported="false">
</service>
<!-- needed for MRGS -->
<activity
android:name="ru.mail.mrgservice.MRGSGCMActivity"
android:configChanges="keyboardHidden|orientation"
android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen"/>
<receiver
android:name="ru.mail.mrgservice.MRGSBroadcastReceiver"
android:exported="true">
<intent-filter>
<action android:name="com.android.vending.INSTALL_REFERRER"/>
</intent-filter>
</receiver>
<receiver android:name="ru.mail.mrgservice.MRGSPackageRemoveReceiver">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED"/>
<data android:scheme="package"/>
</intent-filter>
</receiver>
<receiver android:name="ru.mail.mrgservice.MRGSLocalPushBroadcastReceiver"/>
<receiver android:name="ru.mail.mrgservice.MRGSLocalPushAutoStartReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<receiver android:name="ru.mail.mrgservice.MRGSNotificationDeleteReceiver"/>
<!-- Used to automatically upload Alohalytics statistics using WiFi. -->
<receiver
android:name="org.alohalytics.ConnectivityChangedReceiver"

2
android/build.gradle
View file

@ -23,7 +23,7 @@ dependencies {
compile libGmsLocation, libGmsPlus, libGmsAnalytics
// 3-party
compile libNineOldAndroids, libFacebookSdk
compile fileTree(dir: '3rd_party', include: '*.jar', exclude: 'mrgsmanifest.jar')
compile fileTree(dir: '3rd_party', include: '*.jar')
}
def getDate() {

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

@ -2,7 +2,6 @@ package com.mapswithme.maps;
import android.app.Activity;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.text.TextUtils;
@ -20,12 +19,6 @@ import com.mapswithme.util.Yota;
import com.mapswithme.util.statistics.Statistics;
import java.io.File;
import java.util.Date;
import ru.mail.mrgservice.MRGSApplication;
import ru.mail.mrgservice.MRGSMap;
import ru.mail.mrgservice.MRGSServerData;
import ru.mail.mrgservice.MRGService;
public class MWMApplication extends android.app.Application implements ActiveCountryTree.ActiveCountryListener
{
@ -133,24 +126,6 @@ public class MWMApplication extends android.app.Application implements ActiveCou
BookmarkManager.INSTANCE.getIcons();
}
private void initMrgs()
{
MRGService.setAppContext(this);
final Bundle options = new Bundle();
options.putBoolean("locations", false);
MRGService.service(this, new MRGSServerData.MRGSServerDataDelegate()
{
@Override
public void loadServerDataDidFinished(MRGSMap mrgsMap) {}
@Override
public void loadPromoBannersDidFinished(MRGSMap mrgsMap) {}
}, getString(R.string.mrgs_id), getString(R.string.mrgs_key), options);
if (getLaunchesNumber() == 1)
MRGSApplication.instance().markAsUpdated(new Date());
}
public String getApkPath()
{
try
@ -242,7 +217,6 @@ public class MWMApplication extends android.app.Application implements ActiveCou
mAreStatsInitialised = true;
updateLaunchNumbers();
updateSessionsNumber();
initMrgs();
PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
org.alohalytics.Statistics.setDebugMode(BuildConfig.DEBUG);

11
android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
View file

@ -3,7 +3,7 @@ package com.mapswithme.maps.base;
import android.app.Activity;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.ActionBarActivity;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
@ -11,9 +11,7 @@ import com.mapswithme.maps.MWMApplication;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
import ru.mail.mrgservice.MRGService;
public class BaseMwmFragmentActivity extends AppCompatActivity
public class BaseMwmFragmentActivity extends ActionBarActivity
{
@Override
protected void onCreate(Bundle arg0)
@ -28,6 +26,7 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
MWMApplication.get().initStats();
final ActionBar bar = getSupportActionBar();
// TODO move this functionality to styles.xml
if (bar != null)
bar.setDisplayHomeAsUpEnabled(true);
}
@ -37,8 +36,6 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
{
super.onStart();
Statistics.INSTANCE.startActivity(this);
MRGService.instance().onStart(this);
}
@Override
@ -46,8 +43,6 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
{
Statistics.INSTANCE.stopActivity(this);
super.onStop();
MRGService.instance().onStop(this);
}
@Override

2
android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -62,7 +62,7 @@ public enum LocationHelper implements SensorEventListener
private final float[] mI = new float[9];
private final float[] mOrientation = new float[3];
private LocationHelper()
LocationHelper()
{
mLogger = SimpleLogger.get(LocationHelper.class.getName());
initLocationProvider(false);

4
android/src/com/mapswithme/maps/settings/SettingsActivity.java
View file

@ -36,8 +36,6 @@ import com.mapswithme.util.Yota;
import com.mapswithme.util.statistics.AlohaHelper;
import com.mapswithme.util.statistics.Statistics;
import ru.mail.mrgservice.MRGService;
public class SettingsActivity extends PreferenceActivity implements OnPreferenceClickListener, Preference.OnPreferenceChangeListener
{
public final static String ZOOM_BUTTON_ENABLED = "ZoomButtonsEnabled";
@ -136,7 +134,6 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
super.onStart();
Statistics.INSTANCE.startActivity(this);
MRGService.instance().onStart(this);
}
@Override
@ -145,7 +142,6 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
super.onStop();
Statistics.INSTANCE.stopActivity(this);
MRGService.instance().onStop(this);
}
@Override