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

Turned off PW geoservices

Browse source
This commit is contained in:
r.kuznetsov 2019-07-23 15:29:36 +03:00 • committed by Aleksey Belousov
parent db8666cde5
commit a7835009a8
18 changed files with 1069 additions and 1190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/build.gradle
View file

@ -71,7 +71,6 @@ dependencies {
implementation 'com.facebook.android:audience-network-sdk:4.28.2'
implementation 'com.google.code.gson:gson:2.6.1'
implementation 'com.pushwoosh:pushwoosh:5.17.0'
implementation 'com.pushwoosh:pushwoosh-location:5.17.0'
implementation 'com.pushwoosh:pushwoosh-gcm:5.12.1'
implementation 'com.my.tracker:mytracker-sdk:1.5.3'
implementation ('com.my.target:mytarget-sdk:5.2.2') {

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

@ -520,9 +520,6 @@ public enum LocationHelper
//noinspection ConstantConditions
mLocationProvider.start();
mLogger.d(TAG, mLocationProvider.isActive() ? "SUCCESS" : "FAILURE");
if (mLocationProvider.isActive())
PushwooshHelper.startLocationTracking();
}
private void checkProviderInitialization()
@ -545,7 +542,6 @@ public enum LocationHelper
//noinspection ConstantConditions
mLocationProvider.stop();
mSensorHelper.stop();
PushwooshHelper.stopLocationTracking();
}
/**

11
android/src/com/mapswithme/util/statistics/PushwooshHelper.java
View file

@ -8,7 +8,6 @@ import com.mapswithme.util.log.LoggerFactory;
import com.pushwoosh.Pushwoosh;
import com.pushwoosh.exception.PushwooshException;
import com.pushwoosh.function.Result;
import com.pushwoosh.location.PushwooshLocation;
import com.pushwoosh.tags.TagsBundle;
import java.util.Arrays;
@ -50,16 +49,6 @@ public final class PushwooshHelper
/* Do nothing by default */
}
public static void startLocationTracking()
{
PushwooshLocation.startLocationTracking();
}
public static void stopLocationTracking()
{
PushwooshLocation.stopLocationTracking();
}
public static native void nativeProcessFirstLaunch();
public static native void nativeSendEditorAddObjectTag();
public static native void nativeSendEditorEditObjectTag();

3
iphone/Maps/Core/Location/MWMLocationManager.mm
View file

@ -1,6 +1,5 @@
#import "MWMLocationManager.h"
#import <Pushwoosh/PushNotificationManager.h>
#import <PushwooshGeozones/PWGeozonesManager.h>
#import "MWMAlertViewController.h"
#import "MWMGeoTrackerCore.h"
#import "MWMLocationObserver.h"
@ -510,7 +509,6 @@ void setPermissionRequested()
setPermissionRequested();
if ([CLLocationManager headingAvailable])
[locationManager startUpdatingHeading];
[[PWGeozonesManager sharedManager] startLocationTracking];
};
if ([CLLocationManager locationServicesEnabled])
{
@ -539,7 +537,6 @@ void setPermissionRequested()
[locationManager stopUpdatingLocation];
if ([CLLocationManager headingAvailable])
[locationManager stopUpdatingHeading];
[[PWGeozonesManager sharedManager] stopLocationTracking];
}
#pragma mark - Framework

1
iphone/Maps/Podfile
View file

@ -10,7 +10,6 @@ target 'MAPS.ME' do
pod 'AppsFlyerFramework', '4.9.0'
pod 'Pushwoosh', '5.16.0'
pod 'Pushwoosh/Geozones', '5.16.0'
pod 'ActionSheetPicker-3.0', '2.3.0'
pod 'FBSDKCoreKit', '4.42.0'
pod 'FBSDKLoginKit', '4.42.0'

5
iphone/Maps/Podfile.lock
View file

@ -14,8 +14,6 @@ PODS:
- Pushwoosh (5.16.0):
- Pushwoosh/Core (= 5.16.0)
- Pushwoosh/Core (5.16.0)
- Pushwoosh/Geozones (5.16.0):
- Pushwoosh/Core
DEPENDENCIES:
- ActionSheetPicker-3.0 (= 2.3.0)
@ -23,7 +21,6 @@ DEPENDENCIES:
- FBSDKCoreKit (= 4.42.0)
- FBSDKLoginKit (= 4.42.0)
- Pushwoosh (= 5.16.0)
- Pushwoosh/Geozones (= 5.16.0)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
@ -42,6 +39,6 @@ SPEC CHECKSUMS:
FBSDKLoginKit: 373830c68aa48c9e8f0bfed93a3e32d2ca8963a0
Pushwoosh: 6cba171e52f3f7b8ccd280f492a5831deac2f594
PODFILE CHECKSUM: 242bd36970f8034c39e3bd2e172433edd7ac4fa6
PODFILE CHECKSUM: 43dbe5136a3832c77b331fc98d8534158188dc4c
COCOAPODS: 1.7.4

5
iphone/Maps/Pods/Manifest.lock generated
View file

@ -14,8 +14,6 @@ PODS:
- Pushwoosh (5.16.0):
- Pushwoosh/Core (= 5.16.0)
- Pushwoosh/Core (5.16.0)
- Pushwoosh/Geozones (5.16.0):
- Pushwoosh/Core
DEPENDENCIES:
- ActionSheetPicker-3.0 (= 2.3.0)
@ -23,7 +21,6 @@ DEPENDENCIES:
- FBSDKCoreKit (= 4.42.0)
- FBSDKLoginKit (= 4.42.0)
- Pushwoosh (= 5.16.0)
- Pushwoosh/Geozones (= 5.16.0)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
@ -42,6 +39,6 @@ SPEC CHECKSUMS:
FBSDKLoginKit: 373830c68aa48c9e8f0bfed93a3e32d2ca8963a0
Pushwoosh: 6cba171e52f3f7b8ccd280f492a5831deac2f594
PODFILE CHECKSUM: 242bd36970f8034c39e3bd2e172433edd7ac4fa6
PODFILE CHECKSUM: 43dbe5136a3832c77b331fc98d8534158188dc4c
COCOAPODS: 1.7.4

2144
iphone/Maps/Pods/Pods.xcodeproj/project.pbxproj generated
View file

File diff suppressed because it is too large Load diff

1
iphone/Maps/Pods/Pushwoosh/Framework/PushwooshGeozones.framework/Headers generated
View file

@ -1 +0,0 @@
Versions/Current/Headers

6
iphone/Maps/Pods/Pushwoosh/Framework/PushwooshGeozones.framework/Modules/module.modulemap generated
View file

@ -1,6 +0,0 @@
framework module PushwooshGeozones {
umbrella header "PWGeozonesManager.h"
export *
module * { export * }
}

1
iphone/Maps/Pods/Pushwoosh/Framework/PushwooshGeozones.framework/PushwooshGeozones generated
View file

@ -1 +0,0 @@
Versions/Current/PushwooshGeozones

68
iphone/Maps/Pods/Pushwoosh/Framework/PushwooshGeozones.framework/Versions/A/Headers/PWGeozonesManager.h generated
View file

@ -1,68 +0,0 @@
//
// PWRichMediaManager.h
// Pushwoosh SDK
// (c) Pushwoosh 2018
//
#import <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>
@class PWGeozonesManager;
@protocol PWGeozonesDelegate <NSObject>
@optional
/**
Tells the delegate that location tracking did start.
*/
- (void)didStartLocationTrackingWithManager:(PWGeozonesManager *)geozonesManager;
/**
Tells the delegate that location tracking did fail.
*/
- (void)geozonesManager:(PWGeozonesManager *)geozonesManager startingLocationTrackingDidFail:(NSError *)error;
/**
Tells the delegate that location was successfully sent.
*/
- (void)geozonesManager:(PWGeozonesManager *)geozonesManager didSendLocation:(CLLocation *)location;
@end
@interface PWGeozonesManager: NSObject
/**
Indicates that location tracking has started.
*/
@property (nonatomic, readonly) BOOL enabled;
/**
Delegate that would receive the information about events for geozones manager.
*/
@property (nonatomic, weak) id<PWGeozonesDelegate> delegate;
/**
A singleton object that represents the geozones manager.
*/
+ (instancetype)sharedManager;
/**
Starts location tracking.
*/
- (void)startLocationTracking;
/**
Stops location tracking.
*/
- (void)stopLocationTracking;
/**
Explicitly sends geolocation to the server for GeoFencing push technology. Also called internally in `startLocationTracking` and `stopLocationTracking` functions.
@param location Location to be sent.
*/
- (void)sendLocation:(CLLocation *)location;
@end

BIN
iphone/Maps/Pods/Pushwoosh/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones generated
View file

Binary file not shown.

1
iphone/Maps/Pods/Pushwoosh/Framework/PushwooshGeozones.framework/Versions/Current generated
View file

@ -1 +0,0 @@
A

2
iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.debug.xcconfig generated
View file

@ -2,7 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ActionShe
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ActionSheetPicker-3.0/ActionSheetPicker_3_0.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Bolts/Bolts.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ActionSheetPicker_3_0" -framework "AdSupport" -framework "AppsFlyerLib" -framework "Bolts" -framework "CoreLocation" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "Pushwoosh" -framework "PushwooshGeozones" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -framework "iAd" -weak_framework "Accounts" -weak_framework "AudioToolbox" -weak_framework "CoreGraphics" -weak_framework "CoreLocation" -weak_framework "Foundation" -weak_framework "QuartzCore" -weak_framework "Security" -weak_framework "Social" -weak_framework "UIKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ActionSheetPicker_3_0" -framework "AdSupport" -framework "AppsFlyerLib" -framework "Bolts" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "Pushwoosh" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -framework "iAd" -weak_framework "Accounts" -weak_framework "AudioToolbox" -weak_framework "CoreGraphics" -weak_framework "CoreLocation" -weak_framework "Foundation" -weak_framework "QuartzCore" -weak_framework "Security" -weak_framework "Social" -weak_framework "UIKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

2
iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.production full.xcconfig generated
View file

@ -2,7 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ActionShe
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ActionSheetPicker-3.0/ActionSheetPicker_3_0.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Bolts/Bolts.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ActionSheetPicker_3_0" -framework "AdSupport" -framework "AppsFlyerLib" -framework "Bolts" -framework "CoreLocation" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "Pushwoosh" -framework "PushwooshGeozones" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -framework "iAd" -weak_framework "Accounts" -weak_framework "AudioToolbox" -weak_framework "CoreGraphics" -weak_framework "CoreLocation" -weak_framework "Foundation" -weak_framework "QuartzCore" -weak_framework "Security" -weak_framework "Social" -weak_framework "UIKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ActionSheetPicker_3_0" -framework "AdSupport" -framework "AppsFlyerLib" -framework "Bolts" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "Pushwoosh" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -framework "iAd" -weak_framework "Accounts" -weak_framework "AudioToolbox" -weak_framework "CoreGraphics" -weak_framework "CoreLocation" -weak_framework "Foundation" -weak_framework "QuartzCore" -weak_framework "Security" -weak_framework "Social" -weak_framework "UIKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

2
iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.release.xcconfig generated
View file

@ -2,7 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ActionShe
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ActionSheetPicker-3.0/ActionSheetPicker_3_0.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Bolts/Bolts.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ActionSheetPicker_3_0" -framework "AdSupport" -framework "AppsFlyerLib" -framework "Bolts" -framework "CoreLocation" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "Pushwoosh" -framework "PushwooshGeozones" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -framework "iAd" -weak_framework "Accounts" -weak_framework "AudioToolbox" -weak_framework "CoreGraphics" -weak_framework "CoreLocation" -weak_framework "Foundation" -weak_framework "QuartzCore" -weak_framework "Security" -weak_framework "Social" -weak_framework "UIKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "ActionSheetPicker_3_0" -framework "AdSupport" -framework "AppsFlyerLib" -framework "Bolts" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "Pushwoosh" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -framework "iAd" -weak_framework "Accounts" -weak_framework "AudioToolbox" -weak_framework "CoreGraphics" -weak_framework "CoreLocation" -weak_framework "Foundation" -weak_framework "QuartzCore" -weak_framework "Security" -weak_framework "Social" -weak_framework "UIKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

2
iphone/Maps/Pods/Target Support Files/Pushwoosh/Pushwoosh.xcconfig generated
View file

@ -1,7 +1,7 @@
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Pushwoosh
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Pushwoosh/Framework"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "CoreLocation" -framework "Security" -framework "StoreKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -framework "Security" -framework "StoreKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}