@@ -171,8 +171,7 @@ NSInteger sortByDate(id a, id b, void *context) { NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username"]; NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password"]; - if (!(username == nil || password == nil || - [username length] == 0 || [password length] == 0)) { + if ([username length] != 0 && [password length] != 0) { self.navigationItem.leftBarButtonItem.enabled = false; [self getMessage:loadSentMessage]; } Classes/Controllers/DMTimelineController.m @@ -86,8 +86,7 @@ { NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username"]; NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password"]; - if (!(username == nil || password == nil || - [username length] == 0 || [password length] == 0)) { + if ([username length] != 0 && [password length] != 0) { self.navigationItem.leftBarButtonItem.enabled = false; [timelineDataSource getTimeline]; } Classes/Controllers/FriendsTimelineController.m @@ -25,7 +25,7 @@ text.text = [[NSUserDefaults standardUserDefaults] stringForKey:@"tweet"]; NSNumber *number = [[NSUserDefaults standardUserDefaults] objectForKey:@"inReplyToStatusId"]; - isDirectMessage = [[NSUserDefaults standardUserDefaults] boolForKey:@"isDirectMessage"]; + isDirectMessage = false; inReplyToStatusId = [number longLongValue]; if (inReplyToStatusId) { to.text = [[NSUserDefaults standardUserDefaults] stringForKey:@"to"]; Classes/Controllers/PostView.m @@ -156,7 +156,8 @@ const char *optimize_sql = char *errmsg; NSString *migrateSQL = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"update_v12_to_v13.sql"]; NSData *sqldata = [fileManager contentsAtPath:migrateSQL]; - if (sqlite3_exec(db12, [sqldata bytes], NULL, NULL, &errmsg) == SQLITE_OK) { + NSString *sql = [[[NSString alloc] initWithData:sqldata encoding:NSUTF8StringEncoding] autorelease]; + if (sqlite3_exec(db12, [sql UTF8String], NULL, NULL, &errmsg) == SQLITE_OK) { // succeeded to update. [fileManager moveItemAtPath:oldDBPath toPath:writableDBPath error:&error]; NSLog(@"Updated database from version 1.2 to 1.3."); Classes/Models/DBConnection.m @@ -28,6 +28,7 @@ @interface TwitterFonAppDelegate(Private) - (void)postInit; +- (void)initializeUserDefaults; - (void)setNextTimer:(NSTimeInterval)interval; @end @@ -42,14 +43,15 @@ { [DBConnection createEditableCopyOfDatabaseIfNeeded]; [DBConnection getSharedDatabase]; + [self initializeUserDefaults]; NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username"]; NSString *prevUsername = [[NSUserDefaults standardUserDefaults] stringForKey:@"prevUsername"]; NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password"]; - BOOL needDeleteMessageCache = [[NSUserDefaults standardUserDefaults] boolForKey:@"deleteMessageCache"]; - - if ([username caseInsensitiveCompare:prevUsername] != NSOrderedSame) { + BOOL needDeleteMessageCache = [[NSUserDefaults standardUserDefaults] boolForKey:@"deleteMessageCache"]; + + if (prevUsername != nil && [username caseInsensitiveCompare:prevUsername] != NSOrderedSame) { needDeleteMessageCache = true; } @@ -69,8 +71,7 @@ [window addSubview:tabBarController.view]; - if (username == nil || password == nil || - [username length] == 0 || [password length] == 0) { + if ([username length] == 0 || [password length] == 0) { [self openSettingsView]; } else { @@ -78,6 +79,29 @@ } } +- (void)initializeUserDefaults +{ + NSDictionary* dic = [NSDictionary dictionaryWithObjectsAndKeys: + @"", @"username", + @"", @"password", + [NSNumber numberWithBool:false], @"deleteMessageCache", + [NSNumber numberWithBool:true], @"loadAllTabOnLaunch", + [NSNumber numberWithInt:0], @"autoRefresh", + @"", @"tweet", + [NSNumber numberWithLongLong:0], @"inReplyToStatusId", + @"", @"to", + @"", @"recipient", + [NSNumber numberWithInt:1], @"searchDistance", + [NSNumber numberWithInt:50], @"launchCount", + nil]; + + for (id key in dic) { + if ([[NSUserDefaults standardUserDefaults] objectForKey:key] == nil) { + [[NSUserDefaults standardUserDefaults] setObject:[dic objectForKey:key] forKey:key]; + } + } +} + - (void)postInit { // Load views Classes/OtherSources/TwitterFonAppDelegate.m @@ -1045,7 +1045,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CODE_SIGN_ENTITLEMENTS = dist.plist; CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos2.1]" = "iPhone Distribution: Kazuho Okui"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kazuho Okui"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -1054,7 +1054,6 @@ PREBINDING = NO; PROVISIONING_PROFILE = "361F21B2-4791-4C09-94B0-2260453F4D3F"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "361F21B2-4791-4C09-94B0-2260453F4D3F"; - "PROVISIONING_PROFILE[sdk=iphoneos2.1]" = "0F74D6AA-1337-43EC-9E34-0AFB081302DE"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO; SDKROOT = iphoneos2.0; }; TwitterFon.xcodeproj/project.pbxproj @@ -51,11 +51,11 @@ BEGIN; INSERT INTO users (user_id, name, screen_name, profile_image_url) SELECT * FROM followees; UPDATE users SET location = '', description = '', url = ''; REPLACE INTO users SELECT user_id, name, screen_name, location, descripton, url, followers_count, profile_image_url, protected FROM messages ORDER BY id; -INSERT INTO statuses (id, type, user_id, text, created_at, source, favorited) SELECT id, type, user_id, text, created_at, source, favorited FROM messages WHERE type != 2; +INSERT INTO statuses (id, type, user_id, text, created_at, source, favorited) SELECT id, type, user_id, text, created_at, source, favorited FROM messages WHERE messages.type != 2; UPDATE statuses SET in_reply_to_screen_name = ''; +COMMIT; DROP TABLE messages; -COMMIT; REINDEX statuses; REINDEX users; update_v12_to_v13.sql 8bf42ab032b00b8dfb0e79641237776ae96504c1 kaz kaz@542e9493-1a22-0410-9183-c10453d2b9ee http://github.com/jpick/twitterfon/commit/4b020e518bb70cf3750330c44cf101e4754e2251 4b020e518bb70cf3750330c44cf101e4754e2251 2008-12-19T01:20:15-08:00 2008-12-19T01:20:15-08:00 Fixed an issue in which version up the app discard all message cache git-svn-id: http://naan.net/svn/trunk/TwitterFon@1557 542e9493-1a22-0410-9183-c10453d2b9ee db9375b06d1e507a06f0ccac2d9d7f07b6dd1bf3 kaz kaz@542e9493-1a22-0410-9183-c10453d2b9ee