diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index b552b89b0d..845c6499ea 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -65,10 +65,6 @@ android:name="com.facebook.sdk.ApplicationId" android:value="@string/fb_app_id"/> - - @@ -337,35 +333,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/build.gradle b/android/build.gradle index 4e1080fff4..8984e14ca6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -46,8 +46,6 @@ dependencies { compile('com.crashlytics.sdk.android:crashlytics-ndk:1.1.2@aar') { transitive = true } // 3-party compile 'com.facebook.android:facebook-android-sdk:4.8.0' - compile 'com.parse.bolts:bolts-android:1.4.0' - compile 'com.parse:parse-android:1.13.0' compile 'com.google.code.gson:gson:2.6.1' compile fileTree(dir: '3rd_party', include: '*.jar') // BottomSheet diff --git a/android/jni/com/mapswithme/maps/PrivateVariables.cpp b/android/jni/com/mapswithme/maps/PrivateVariables.cpp index d38feeebbe..55fa8722e8 100644 --- a/android/jni/com/mapswithme/maps/PrivateVariables.cpp +++ b/android/jni/com/mapswithme/maps/PrivateVariables.cpp @@ -22,18 +22,6 @@ extern "C" return env->NewStringUTF(MY_TRACKER_KEY); } - JNIEXPORT jstring JNICALL - Java_com_mapswithme_maps_PrivateVariables_parseApplicationId(JNIEnv * env, jclass clazz) - { - return env->NewStringUTF(PARSE_APPLICATION_ID); - } - - JNIEXPORT jstring JNICALL - Java_com_mapswithme_maps_PrivateVariables_parseClientKey(JNIEnv * env, jclass clazz) - { - return env->NewStringUTF(PARSE_CLIENT_KEY); - } - JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_PrivateVariables_myTargetSlot(JNIEnv * env, jclass clazz) { diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index c335cd0947..1de77a3e52 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -31,16 +31,7 @@ import com.mapswithme.util.Config; import com.mapswithme.util.Constants; import com.mapswithme.util.ThemeSwitcher; import com.mapswithme.util.UiUtils; -import com.mapswithme.util.statistics.AlohaHelper; import com.mapswithme.util.statistics.Statistics; -import com.parse.GcmBroadcastReceiver; -import com.parse.Parse; -import com.parse.ParseBroadcastReceiver; -import com.parse.ParseException; -import com.parse.ParseInstallation; -import com.parse.ParsePushBroadcastReceiver; -import com.parse.PushService; -import com.parse.SaveCallback; import io.fabric.sdk.android.Fabric; import net.hockeyapp.android.CrashManager; @@ -48,10 +39,6 @@ public class MwmApplication extends Application { private final static String TAG = "MwmApplication"; - // Parse - private static final String PREF_PARSE_DEVICE_TOKEN = "ParseDeviceToken"; - private static final String PREF_PARSE_INSTALLATION_ID = "ParseInstallationId"; - private static MwmApplication sSelf; private SharedPreferences mPrefs; private AppBackgroundTracker mBackgroundTracker; @@ -121,7 +108,6 @@ public class MwmApplication extends Application BuildConfig.FLAVOR, BuildConfig.BUILD_TYPE, UiUtils.isTablet()); mPrefs = getSharedPreferences(getString(R.string.pref_file_name), MODE_PRIVATE); - initParse(); mBackgroundTracker = new AppBackgroundTracker(); TrackRecorder.init(); Editor.init(); @@ -238,56 +224,6 @@ public class MwmApplication extends Application System.loadLibrary("mapswithme"); } - /* - * init Parse SDK - */ - private void initParse() - { - // Do not initialize Parse in default open-source version. - final String appId = PrivateVariables.parseApplicationId(); - if (appId.isEmpty()) - { - PackageManager pm = getPackageManager(); - - ComponentName c = new ComponentName(this, PushService.class); - if (pm.getComponentEnabledSetting(c) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) - { - pm.setComponentEnabledSetting(c, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - c = new ComponentName(this, ParseBroadcastReceiver.class); - pm.setComponentEnabledSetting(c, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - c = new ComponentName(this, ParsePushBroadcastReceiver.class); - pm.setComponentEnabledSetting(c, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - c = new ComponentName(this, GcmBroadcastReceiver.class); - pm.setComponentEnabledSetting(c, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - } - return; - } - - Parse.initialize(this, appId, PrivateVariables.parseClientKey()); - ParseInstallation.getCurrentInstallation().saveInBackground(new SaveCallback() - { - @Override - public void done(ParseException e) - { - SharedPreferences prefs = prefs(); - String previousId = prefs.getString(PREF_PARSE_INSTALLATION_ID, ""); - String previousToken = prefs.getString(PREF_PARSE_DEVICE_TOKEN, ""); - - String newId = ParseInstallation.getCurrentInstallation().getInstallationId(); - String newToken = ParseInstallation.getCurrentInstallation().getString("deviceToken"); - if (!previousId.equals(newId) || !previousToken.equals(newToken)) - { - org.alohalytics.Statistics.logEvent(AlohaHelper.PARSE_INSTALLATION_ID, newId); - org.alohalytics.Statistics.logEvent(AlohaHelper.PARSE_DEVICE_TOKEN, newToken); - prefs.edit() - .putString(PREF_PARSE_INSTALLATION_ID, newId) - .putString(PREF_PARSE_DEVICE_TOKEN, newToken).apply(); - } - } - }); - } - public void initCounters() { if (!mAreCountersInitialized) diff --git a/android/src/com/mapswithme/maps/PrivateVariables.java b/android/src/com/mapswithme/maps/PrivateVariables.java index 3f7ee62202..dd413627e2 100644 --- a/android/src/com/mapswithme/maps/PrivateVariables.java +++ b/android/src/com/mapswithme/maps/PrivateVariables.java @@ -8,8 +8,6 @@ public class PrivateVariables public static native String alohalyticsUrl(); public static native String flurryKey(); public static native String myTrackerKey(); - public static native String parseApplicationId(); - public static native String parseClientKey(); public static native String myTargetSlot(); public static native String myTargetCheckUrl(); /** diff --git a/android/src/com/mapswithme/util/statistics/AlohaHelper.java b/android/src/com/mapswithme/util/statistics/AlohaHelper.java index bee53e9f26..7802839195 100644 --- a/android/src/com/mapswithme/util/statistics/AlohaHelper.java +++ b/android/src/com/mapswithme/util/statistics/AlohaHelper.java @@ -80,9 +80,6 @@ public class AlohaHelper public static final String ROUTING_SEARCH_POINT = "routSearchPoint"; // search public static final String SEARCH_CANCEL = "searchCancel"; - // installation of Parse - public static final String PARSE_INSTALLATION_ID = "Android_Parse_Installation_Id"; - public static final String PARSE_DEVICE_TOKEN = "Android_Parse_Device_Token"; // installation public static final String GPLAY_INSTALL_REFERRER = "$googlePlayInstallReferrer"; } diff --git a/configure.sh b/configure.sh index 1f8c9faed0..2bada00f25 100755 --- a/configure.sh +++ b/configure.sh @@ -34,8 +34,6 @@ else #define MY_TRACKER_KEY "" #define MY_TARGET_KEY "" #define PUSHWOOSH_APPLICATION_ID "" -#define PARSE_APPLICATION_ID "" -#define PARSE_CLIENT_KEY "" #define OSM_CONSUMER_KEY "" #define OSM_CONSUMER_SECRET "" #define MWM_GEOLOCATION_SERVER ""