Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 4.12.0 #314

Merged
merged 74 commits into from
Dec 13, 2017
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
581f80d
Fix api changes in unit tests
nonelse May 5, 2017
ca545f4
Queue set enabled and offline operations
nonelse Jun 29, 2017
c80581c
Rename internal state vars
nonelse Jun 30, 2017
ea13fdb
Send first session package even with buffering
nonelse Jun 30, 2017
d6719b0
Save askingAttribution inside internal queue
nonelse Jun 30, 2017
a7ce144
Refac adjust instance logs
nonelse Jul 3, 2017
fbff7f7
Refac save properties into class
nonelse Jul 3, 2017
5e94e02
Inject enabled and disabled at start time
nonelse Jul 3, 2017
235d058
Block adding packages when disabled
nonelse Jul 3, 2017
1d6b274
Read idfa for every package
nonelse Jul 3, 2017
872cb58
Add sending mcc and mnc to ADJDeviceInfo
Jul 14, 2017
b88b260
Add CoreTelephpny.framework as an optional framework
Jul 14, 2017
054db97
Teardown static util instances
nonelse Jul 25, 2017
74062fa
Move MCC MNC from device info
nonelse Jul 26, 2017
b1c0b6b
Add connectivity type
nonelse Jul 26, 2017
ef43b25
Add network type
nonelse Jul 26, 2017
9cfb378
Set device known
nonelse Jul 27, 2017
973ba44
Read attribution group with reflection
nonelse Jul 27, 2017
7402855
Rename log to string func
nonelse Jul 27, 2017
3d463f9
Add suppress to loglevel to string
nonelse Jul 27, 2017
af5c807
Rename connectivity and network type
nonelse Jul 27, 2017
561a525
Inject session parameters to builder
nonelse Jul 27, 2017
711dbbc
Set external device id
nonelse Jul 27, 2017
0d477ec
Adjust files migration
uerceg Aug 1, 2017
e189589
Use path in deleteFile method
uerceg Aug 1, 2017
26daf14
Send file name, not the path from ADJPackageHandler
uerceg Aug 1, 2017
1a6e055
Return object read from old file after migration
uerceg Aug 1, 2017
dca40a9
Print paths and check for NSArray in Documents folder as well
uerceg Aug 1, 2017
780a215
Add auth header
nonelse Aug 8, 2017
4f9a130
Rename sdk click factory method
nonelse Aug 16, 2017
a5e4c1f
Use sha256
nonelse Aug 17, 2017
38abd97
Adding ADJUserDefaults class
uerceg Aug 17, 2017
ba5ae97
Enable/disable logic update feat Adjust.m cleanup
uerceg Aug 17, 2017
0c17e2d
AdjustBridge update and new version 4.9.1
uerceg Aug 17, 2017
05a4301
Example apps update but tvOS one
uerceg Aug 17, 2017
ede160e
Adjust Web Bridge README link update
uerceg Aug 17, 2017
8d3edf8
Excluding CoreTelephony stuff from tvOS platform
uerceg Aug 17, 2017
f061010
Macro check change
uerceg Aug 17, 2017
499c521
Improved push token handling
uerceg Aug 21, 2017
4d90153
ADJUserDefaults cleanup
uerceg Aug 21, 2017
44c2587
Queue initialisation first and check enabled when trying to send sdk_…
uerceg Aug 21, 2017
dcf3ef0
Fix auth header
nonelse Aug 22, 2017
6b3f0e4
Save and send external device id
nonelse Aug 22, 2017
4b3c30a
Access radio tech with reflection
nonelse Aug 22, 2017
634c78a
Don't use static NSDateFormatter instance
uerceg Aug 23, 2017
1f70f75
Atomic access to paused field
uerceg Aug 23, 2017
6116531
Remove iad v2
nonelse Aug 24, 2017
48ee8a4
File reading/migrating logs formatting
uerceg Aug 25, 2017
4810de9
A bit more logging
uerceg Aug 25, 2017
86806da
New version 4.12.0
uerceg Aug 28, 2017
11abb10
Change signature parameters
nonelse Sep 7, 2017
184d2d6
Refac file deletion
nonelse Sep 7, 2017
50ee618
Remove external device id
nonelse Sep 13, 2017
9de38c5
Refac get request
nonelse Sep 21, 2017
1f84045
Add secret id
nonelse Sep 21, 2017
9446a6e
Rebase cleanup
uerceg Sep 27, 2017
8453a8c
Update WebViewJavascriptBridge framework to 6.0.2
nonelse Sep 26, 2017
cfb80fa
Remove unecessary bridge references
nonelse Sep 26, 2017
558da14
Update web view bridge example
nonelse Sep 26, 2017
362c06d
Webview bridge guide update
nonelse Sep 26, 2017
df5a995
Extract secret from package before request
nonelse Oct 2, 2017
88ae036
Remove read session parameters
nonelse Oct 4, 2017
19efe4c
Don't log authentication stuff
uerceg Oct 5, 2017
59a2f10
Project updates with recommended warnings
uerceg Oct 14, 2017
7f5077c
Enable v3 -> v4 internal files migration
uerceg Oct 30, 2017
20595a5
Fix potential deadlock when accessing a shared pasteboard from a back…
sanekgusev Oct 30, 2017
f777746
current-install-to-current-attribution
Nov 29, 2017
1df6fa6
App secret variable rename
uerceg Dec 3, 2017
bb67938
Update README.md
uerceg Dec 11, 2017
e2dc5ec
Update CHANGELOG.md
uerceg Dec 11, 2017
e276ad6
Update CHANGELOG.md
uerceg Dec 11, 2017
160ab21
Update README.md
uerceg Dec 12, 2017
43f2efd
proofing
Dec 12, 2017
7f5f12b
Update CHANGELOG.md
uerceg Dec 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add sending mcc and mnc to ADJDeviceInfo
  • Loading branch information
Obaied authored and uerceg committed Dec 11, 2017
commit 872cb58c3de75923277e591f519280499b579378
2 changes: 2 additions & 0 deletions Adjust/ADJDeviceInfo.h
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@
@property (nonatomic, copy) NSString *cpuSubtype;
@property (nonatomic, copy) NSString *installReceiptBase64;
@property (nonatomic, copy) NSString *osBuild;
@property (nonatomic, copy) NSString *mcc;
@property (nonatomic, copy) NSString *mnc;

- (id)initWithSdkPrefix:(NSString *)sdkPrefix;
+ (ADJDeviceInfo *)deviceInfoWithSdkPrefix:(NSString *)sdkPrefix;
10 changes: 10 additions & 0 deletions Adjust/ADJDeviceInfo.m
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@
#import "ADJUtil.h"
#import "ADJSystemProfile.h"
#import "NSData+ADJAdditions.h"
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
#import <CoreTelephony/CTCarrier.h>



@implementation ADJDeviceInfo

@@ -44,6 +48,12 @@ - (id)initWithSdkPrefix:(NSString *)sdkPrefix {
self.machineModel = [ADJSystemProfile machineModel];
self.cpuSubtype = [ADJSystemProfile cpuSubtype];
self.osBuild = [ADJSystemProfile osVersion];

//MCC & MNC
CTTelephonyNetworkInfo *networkInfo = [[CTTelephonyNetworkInfo alloc] init];
CTCarrier *carrier = [networkInfo subscriberCellularProvider];
self.mcc = [carrier mobileCountryCode];
self.mnc = [carrier mobileNetworkCode];

if (sdkPrefix == nil) {
self.clientSdk = ADJUtil.clientSdk;
2 changes: 2 additions & 0 deletions Adjust/ADJPackageBuilder.m
Original file line number Diff line number Diff line change
@@ -250,6 +250,8 @@ - (void)injectDeviceInfo:(ADJDeviceInfo *)deviceInfo intoParameters:(NSMutableDi
[ADJPackageBuilder parameters:parameters setString:deviceInfo.cpuSubtype forKey:@"cpu_type"];
[ADJPackageBuilder parameters:parameters setString:deviceInfo.installReceiptBase64 forKey:@"install_receipt"];
[ADJPackageBuilder parameters:parameters setString:deviceInfo.osBuild forKey:@"os_build"];
[ADJPackageBuilder parameters:parameters setString:deviceInfo.mcc forKey:@"mcc"];
[ADJPackageBuilder parameters:parameters setString:deviceInfo.mnc forKey:@"mnc"];
}

- (void)injectConfig:(ADJConfig *)adjustConfig intoParameters:(NSMutableDictionary *) parameters {