Changeset 283 for apps/iphone
- Timestamp:
- 03/24/09 13:58:13 (4 years ago)
- Location:
- apps/iphone/my.tel/trunk
- Files:
-
- 5 modified
-
Classes/DotTel_SDK/Classes/DnsResolver.m (modified) (4 diffs)
-
Classes/DotTel_SDK/Classes/RecordNaptr.m (modified) (1 diff)
-
Classes/DotTel_SDK/ldns_sources/resolver.c (modified) (1 diff)
-
Classes/LoginViewController.m (modified) (3 diffs)
-
MainWindow.xib (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
-
apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/DnsResolver.m
r217 r283 136 136 137 137 s = ldns_resolver_new_frm_file(&resolver, [resolverFilePath cStringUsingEncoding:NSASCIIStringEncoding]); 138 return resolver; 138 if (s == LDNS_STATUS_OK) { 139 #ifdef DEBUG 140 ldns_resolver_set_debug(resolver, TRUE); 141 #endif 142 ldns_resolver_set_edns_udp_size(resolver, 8000); 143 return resolver; 144 } else { 145 return NULL; 146 } 139 147 } 140 148 … … 147 155 if (!ldnsdomain) { 148 156 //NSLog(@"Can't do ldns_dname_new_frm_str"); 149 return rrlist;157 return NULL; 150 158 } 151 159 … … 161 169 if (!p) { 162 170 //NSLog(@"Can't do ldns_resolver_query"); 163 return rrlist;171 return NULL; 164 172 } 165 173 … … 171 179 LDNS_SECTION_ANSWER); 172 180 if (!rrlist) { 173 //NSLog(@" *** invalid answer name after TXTquery\n");181 //NSLog(@" *** invalid answer name after query\n"); 174 182 ldns_pkt_free(p); 175 return rrlist;183 return NULL; 176 184 } 177 185 -
apps/iphone/my.tel/trunk/Classes/DotTel_SDK/Classes/RecordNaptr.m
r217 r283 60 60 isValid = NO; 61 61 62 if (!rr) 63 return self; 62 64 if (ldns_rr_get_type(rr) != LDNS_RR_TYPE_NAPTR) 63 65 return self; -
apps/iphone/my.tel/trunk/Classes/DotTel_SDK/ldns_sources/resolver.c
r217 r283 1057 1057 } 1058 1058 #endif /* HAVE_SSL */ 1059 /* TODO: XXXXXXXXXX Hack to ensure naptrs are gotten through EDNS0 */1060 if (type == LDNS_RR_TYPE_NAPTR) {1061 ldns_pkt_set_edns_udp_size(query_pkt, 4096);1062 // ldns_pkt_set_edns_extended_rcode(query_pkt, 0);1063 ldns_pkt_set_edns_version(query_pkt, 0);1064 // ldns_pkt_set_edns_z(query_pkt, 0);1065 // ldns_pkt_set_edns_data(query_pkt, NULL);1066 }1067 1059 1068 1060 status = ldns_resolver_send_pkt(&answer_pkt, r, query_pkt); -
apps/iphone/my.tel/trunk/Classes/LoginViewController.m
r247 r283 93 93 password = fieldPassword.text; 94 94 if ([fieldDomain.text hasSuffix:@".vip.tel"]) { 95 domainName = fieldDomain.text;95 domainName = [NSString stringWithString:fieldDomain.text]; 96 96 } else if ([fieldDomain.text hasSuffix:@".tel"]) { 97 domainName = fieldDomain.text;98 } else { 99 domainName = [fieldDomain.text stringByAppendingString:@". vip.tel"];97 domainName = [NSString stringWithString:fieldDomain.text]; 98 } else { 99 domainName = [fieldDomain.text stringByAppendingString:@".tel"]; 100 100 } 101 101 if (!apiRootUrl || [apiRootUrl isEqualToString:@""]) { … … 120 120 121 121 if (!apiRootUrl || [apiRootUrl isEqualToString:@""]) { 122 [self showLoginCredentials:@"Couldn't automatically find the API URL. Please enter it manually in the Settings App"];122 [self showLoginCredentials:@"Couldn't automatically find the API URL.\nIs the domain correct? You can directly set the API URL in the Settings App."]; 123 123 } else { 124 124 [self performLogin]; … … 165 165 // Data connection activation is now started 166 166 // try to autoprovision apiRootUrl 167 NSMutableArray *naptrArray = [[NSMutableArray arrayWithCapacity:1] retain]; 168 NSString *autoProvisionDomain = [@"_https._nsp._apps." stringByAppendingString:aDomain]; 167 169 resolver = [[[DnsResolver alloc] init] retain]; 168 NSMutableArray *naptrArray = [[NSMutableArray arrayWithCapacity:1] retain];169 NSString *autoProvisionDomain = [@"_https._nsp._apps." stringByAppendingString:domainName];170 170 [resolver getNAPTRForTel:autoProvisionDomain inArray:naptrArray]; 171 171 if ([naptrArray count] == 0) { 172 172 // couldn't find anything, try in http mode 173 NSString *autoProvisionDomainHttp = [@"_http._nsp._apps." stringByAppendingString: domainName];173 NSString *autoProvisionDomainHttp = [@"_http._nsp._apps." stringByAppendingString:aDomain]; 174 174 [resolver getNAPTRForTel:autoProvisionDomainHttp inArray:naptrArray]; 175 175 } 176 [resolver release]; 176 177 [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO]; 177 [resolver release];178 178 if ([naptrArray count] > 0) { 179 179 // we have autoprovision of the Telhosting URL, let's tweak it to get the JSON API -
apps/iphone/my.tel/trunk/MainWindow.xib
r266 r283 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 11 <integer value="283"/> 12 <integer value="445"/> 12 13 </object> 13 14 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 59 60 <string key="NSFrame">{{0, -20}, {320, 480}}</string> 60 61 <reference key="NSSuperview" ref="653160384"/> 61 <reference key="NSWindow"/>62 62 <object class="NSColor" key="IBUIBackgroundColor" id="1003714482"> 63 63 <int key="NSColorSpace">1</int> … … 76 76 <string key="NSFrame">{{0, -20}, {320, 480}}</string> 77 77 <reference key="NSSuperview" ref="653160384"/> 78 <reference key="NSWindow"/>79 78 <bool key="IBUIClipsSubviews">YES</bool> 80 79 <int key="IBUIContentMode">4</int> … … 95 94 <string key="NSFrame">{{123, 31}, {159, 31}}</string> 96 95 <reference key="NSSuperview" ref="729267121"/> 97 <reference key="NSWindow"/>98 96 <bool key="IBUIOpaque">NO</bool> 99 97 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> … … 127 125 <string key="NSFrame">{{123, 69}, {128, 31}}</string> 128 126 <reference key="NSSuperview" ref="729267121"/> 129 <reference key="NSWindow"/>130 127 <bool key="IBUIOpaque">NO</bool> 131 128 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> … … 152 149 <string key="NSFrame">{{123, 107}, {128, 31}}</string> 153 150 <reference key="NSSuperview" ref="729267121"/> 154 <reference key="NSWindow"/>155 151 <bool key="IBUIOpaque">NO</bool> 156 152 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> … … 178 174 <string key="NSFrame">{{0, 35}, {113, 21}}</string> 179 175 <reference key="NSSuperview" ref="729267121"/> 180 <reference key="NSWindow"/>181 176 <bool key="IBUIOpaque">NO</bool> 182 177 <bool key="IBUIClipsSubviews">YES</bool> … … 194 189 <string key="NSFrame">{{0, 3}, {282, 21}}</string> 195 190 <reference key="NSSuperview" ref="729267121"/> 196 <reference key="NSWindow"/>197 191 <bool key="IBUIOpaque">NO</bool> 198 192 <bool key="IBUIClipsSubviews">YES</bool> … … 215 209 <string key="NSFrame">{{0, 73}, {111, 21}}</string> 216 210 <reference key="NSSuperview" ref="729267121"/> 217 <reference key="NSWindow"/>218 211 <bool key="IBUIOpaque">NO</bool> 219 212 <bool key="IBUIClipsSubviews">YES</bool> … … 231 224 <string key="NSFrame">{{0, 111}, {108, 21}}</string> 232 225 <reference key="NSSuperview" ref="729267121"/> 233 <reference key="NSWindow"/>234 226 <bool key="IBUIOpaque">NO</bool> 235 227 <bool key="IBUIClipsSubviews">YES</bool> … … 247 239 <string key="NSFrame">{{99, 146}, {83, 33}}</string> 248 240 <reference key="NSSuperview" ref="729267121"/> 249 <reference key="NSWindow"/>250 241 <bool key="IBUIOpaque">NO</bool> 251 242 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> … … 271 262 <reference key="NSNextResponder" ref="729267121"/> 272 263 <int key="NSvFlags">-2147483356</int> 273 <string key="NSFrame">{{2, 183}, {280, 21}}</string>264 <string key="NSFrame">{{2, 183}, {280, 50}}</string> 274 265 <reference key="NSSuperview" ref="729267121"/> 275 <reference key="NSWindow"/>276 266 <object class="NSColor" key="IBUIBackgroundColor"> 277 267 <int key="NSColorSpace">1</int> … … 293 283 <int key="IBUIBaselineAdjustment">1</int> 294 284 <float key="IBUIMinimumFontSize">1.000000e+01</float> 285 <int key="IBUINumberOfLines">3</int> 295 286 <int key="IBUITextAlignment">1</int> 287 <int key="IBUILineBreakMode">0</int> 296 288 </object> 297 289 <object class="IBUITextView" id="279755524"> … … 300 292 <string key="NSFrame">{{0, 259}, {282, 136}}</string> 301 293 <reference key="NSSuperview" ref="729267121"/> 302 <reference key="NSWindow"/>303 294 <bool key="IBUIOpaque">NO</bool> 304 295 <bool key="IBUIClipsSubviews">YES</bool> … … 321 312 <string key="NSFrame">{{19, 30}, {282, 415}}</string> 322 313 <reference key="NSSuperview" ref="653160384"/> 323 <reference key="NSWindow"/>324 314 <object class="NSColor" key="IBUIBackgroundColor"> 325 315 <int key="NSColorSpace">3</int> … … 340 330 <string key="NSFrame">{{0, 20}, {160, 21}}</string> 341 331 <reference key="NSSuperview" ref="1010637384"/> 342 <reference key="NSWindow"/>343 332 <bool key="IBUIOpaque">NO</bool> 344 333 <bool key="IBUIClipsSubviews">YES</bool> … … 367 356 <string key="NSFrame">{{61, 49}, {37, 37}}</string> 368 357 <reference key="NSSuperview" ref="1010637384"/> 369 <reference key="NSWindow"/>370 358 <bool key="IBUIOpaque">NO</bool> 371 359 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> … … 378 366 <string key="NSFrame">{{80, 13}, {160, 118}}</string> 379 367 <reference key="NSSuperview" ref="653160384"/> 380 <reference key="NSWindow"/>381 368 <object class="NSColor" key="IBUIBackgroundColor"> 382 369 <int key="NSColorSpace">3</int> … … 390 377 <string key="NSFrameSize">{320, 460}</string> 391 378 <reference key="NSSuperview"/> 392 <reference key="NSWindow"/>393 379 <reference key="IBUIBackgroundColor" ref="618958994"/> 394 380 <bool key="IBUIOpaque">NO</bool> … … 1087 1073 <object class="NSMutableArray" key="dict.sortedKeys"> 1088 1074 <bool key="EncodedWithXMLCoder">YES</bool> 1075 <string>closeAboutView:</string> 1089 1076 <string>didPressCancel:</string> 1090 1077 <string>didPressDomainButton:</string> 1078 <string>didPressInfoButton:</string> 1091 1079 <string>didPressProfileButton:</string> 1092 1080 <string>didPressSave:</string> … … 1094 1082 <object class="NSMutableArray" key="dict.values"> 1095 1083 <bool key="EncodedWithXMLCoder">YES</bool> 1084 <string>id</string> 1085 <string>id</string> 1096 1086 <string>id</string> 1097 1087 <string>id</string> … … 1385 1375 </object> 1386 1376 <object class="IBPartialClassDescription"> 1387 <string key="className">RMMapView</string>1388 <string key="superclassName">UIView</string>1389 <object class="NSMutableDictionary" key="outlets">1390 <string key="NS.key.0">delegate</string>1391 <string key="NS.object.0">id</string>1392 </object>1393 <object class="IBClassDescriptionSource" key="sourceIdentifier">1394 <string key="majorKey">IBProjectSource</string>1395 <string key="minorKey">Classes/MapView/RMMapView.h</string>1396 </object>1397 </object>1398 <object class="IBPartialClassDescription">1399 1377 <string key="className">RecordEditController</string> 1400 1378 <string key="superclassName">UIViewController</string>
