Skip to content

Commit 3e146d5

Browse files
author
Edward Smith
committed
Fixes for iOS 7 / Xcode 7.
1 parent 7683ffd commit 3e146d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+344
-50
lines changed

‎Branch-SDK/Branch-SDK/BNCDeviceInfo.m‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,14 @@ + (NSString*) userAgentString {
151151
return browserUserAgentString;
152152
}
153153

154+
// Different case for iOS 7.0:
155+
if ([UIDevice currentDevice].systemVersion.floatValue < 8.0) {
156+
dispatch_sync(dispatch_get_main_queue(), ^ {
157+
setBrowserUserAgent();
158+
});
159+
return browserUserAgentString;
160+
}
161+
154162
// Wait and yield to prevent deadlock:
155163

156164
int retries = 10;

‎Branch-SDK/Branch-SDK/Requests/BranchOpenRequest.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// Copyright (c) 2015 Branch Metrics. All rights reserved.
77
//
88

9+
910
#import "BranchOpenRequest.h"
1011
#import "BNCPreferenceHelper.h"
1112
#import "BNCSystemObserver.h"

‎Branch-TestBed/Branch-TestBed/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
{
22
"images" : [
3-
{
4-
"idiom" : "iphone",
5-
"size" : "20x20",
6-
"scale" : "2x"
7-
},
8-
{
9-
"idiom" : "iphone",
10-
"size" : "20x20",
11-
"scale" : "3x"
12-
},
133
{
144
"size" : "29x29",
155
"idiom" : "iphone",
@@ -64,16 +54,6 @@
6454
"filename" : "icon180x180.png",
6555
"scale" : "3x"
6656
},
67-
{
68-
"idiom" : "ipad",
69-
"size" : "20x20",
70-
"scale" : "1x"
71-
},
72-
{
73-
"idiom" : "ipad",
74-
"size" : "20x20",
75-
"scale" : "2x"
76-
},
7757
{
7858
"size" : "29x29",
7959
"idiom" : "ipad",
@@ -139,6 +119,26 @@
139119
"idiom" : "ipad",
140120
"filename" : "icon167x167.png",
141121
"scale" : "2x"
122+
},
123+
{
124+
"idiom" : "iphone",
125+
"size" : "20x20",
126+
"scale" : "2x"
127+
},
128+
{
129+
"idiom" : "iphone",
130+
"size" : "20x20",
131+
"scale" : "3x"
132+
},
133+
{
134+
"idiom" : "ipad",
135+
"size" : "20x20",
136+
"scale" : "1x"
137+
},
138+
{
139+
"idiom" : "ipad",
140+
"size" : "20x20",
141+
"scale" : "2x"
142142
}
143143
],
144144
"info" : {

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
{
2+
"images" : [
3+
{
4+
"size" : "29x29",
5+
"idiom" : "iphone",
6+
"filename" : "icon29x29.png",
7+
"scale" : "1x"
8+
},
9+
{
10+
"size" : "29x29",
11+
"idiom" : "iphone",
12+
"filename" : "icon58x58.png",
13+
"scale" : "2x"
14+
},
15+
{
16+
"size" : "29x29",
17+
"idiom" : "iphone",
18+
"filename" : "icon87x87.png",
19+
"scale" : "3x"
20+
},
21+
{
22+
"size" : "40x40",
23+
"idiom" : "iphone",
24+
"filename" : "icon80x80-1.png",
25+
"scale" : "2x"
26+
},
27+
{
28+
"size" : "40x40",
29+
"idiom" : "iphone",
30+
"filename" : "icon120x120-1.png",
31+
"scale" : "3x"
32+
},
33+
{
34+
"size" : "57x57",
35+
"idiom" : "iphone",
36+
"filename" : "icon57x57.png",
37+
"scale" : "1x"
38+
},
39+
{
40+
"size" : "57x57",
41+
"idiom" : "iphone",
42+
"filename" : "icon114x114.png",
43+
"scale" : "2x"
44+
},
45+
{
46+
"size" : "60x60",
47+
"idiom" : "iphone",
48+
"filename" : "icon120x120.png",
49+
"scale" : "2x"
50+
},
51+
{
52+
"size" : "60x60",
53+
"idiom" : "iphone",
54+
"filename" : "icon180x180.png",
55+
"scale" : "3x"
56+
},
57+
{
58+
"size" : "29x29",
59+
"idiom" : "ipad",
60+
"filename" : "icon29x29-1.png",
61+
"scale" : "1x"
62+
},
63+
{
64+
"size" : "29x29",
65+
"idiom" : "ipad",
66+
"filename" : "icon58x58-1.png",
67+
"scale" : "2x"
68+
},
69+
{
70+
"size" : "40x40",
71+
"idiom" : "ipad",
72+
"filename" : "icon40x40.png",
73+
"scale" : "1x"
74+
},
75+
{
76+
"size" : "40x40",
77+
"idiom" : "ipad",
78+
"filename" : "icon80x80.png",
79+
"scale" : "2x"
80+
},
81+
{
82+
"size" : "50x50",
83+
"idiom" : "ipad",
84+
"filename" : "icon50x50.png",
85+
"scale" : "1x"
86+
},
87+
{
88+
"size" : "50x50",
89+
"idiom" : "ipad",
90+
"filename" : "icon100x100.png",
91+
"scale" : "2x"
92+
},
93+
{
94+
"size" : "72x72",
95+
"idiom" : "ipad",
96+
"filename" : "icon72x72.png",
97+
"scale" : "1x"
98+
},
99+
{
100+
"size" : "72x72",
101+
"idiom" : "ipad",
102+
"filename" : "icon144x144.png",
103+
"scale" : "2x"
104+
},
105+
{
106+
"size" : "76x76",
107+
"idiom" : "ipad",
108+
"filename" : "icon76x76.png",
109+
"scale" : "1x"
110+
},
111+
{
112+
"size" : "76x76",
113+
"idiom" : "ipad",
114+
"filename" : "icon152x152-1.png",
115+
"scale" : "2x"
116+
},
117+
{
118+
"size" : "83.5x83.5",
119+
"idiom" : "ipad",
120+
"filename" : "icon167x167.png",
121+
"scale" : "2x"
122+
}
123+
],
124+
"info" : {
125+
"version" : 1,
126+
"author" : "xcode"
127+
}
128+
}

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/icon100x100.png‎

7.9 KB
Loading

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/icon114x114.png‎

9.61 KB
Loading

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/icon120x120-1.png‎

10.2 KB
Loading

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/icon120x120.png‎

10.2 KB
Loading

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/icon144x144.png‎

12.7 KB
Loading

‎Branch-TestBed/Branch-TestBed/Xcode-7-Assets.xcassets/AppIcon.appiconset/icon152x152-1.png‎

13.7 KB
Loading

0 commit comments

Comments
 (0)