db/create.sql db/db1.4.sql db/update_v12_to_v13.sql db/update_v13_to_v14.sql etc/test/error.json etc/test/friends_timeline.json etc/test/naan_db1.2.sql etc/test/naantest_db1.2.sql etc/test/null_friends_timelne.json etc/test/replies.json @@ -20,6 +20,7 @@ TwitterClient* twitterClient; NSString* screenName; BOOL isRestored; + int page; } - (void)loadTimeline:(NSString*)screenName; Classes/Controllers/FavoritesViewController.h @@ -25,6 +25,7 @@ - (void)viewDidLoad { + page = 1; if (timeline == nil) { timeline = [[Timeline alloc] init]; } @@ -97,8 +98,12 @@ int count = 0; while ([stmt step] == SQLITE_ROW) { Status* sts = [Status initWithStatement:stmt type:TWEET_TYPE_FAVORITES]; - [timeline appendStatus:sts]; - ++count; + if (sts) { + if ([timeline indexOfObject:sts] == -1) { + [timeline appendStatus:sts]; + ++count; + } + } } isRestored = all; return count; @@ -185,7 +190,7 @@ if (twitterClient) return; [loadCell.spinner startAnimating]; twitterClient = [[TwitterClient alloc] initWithTarget:self action:@selector(favoritesDidReceive:obj:)]; - int page = ([timeline countStatuses] / 20) + 1; + ++page; [twitterClient favorites:screenName page:page]; } else { @@ -242,9 +247,21 @@ else { return; } + + int received = [ary count]; + NSLog(@"Received %d favorites", received); + if (screenName == nil) { + int count = [timeline countStatuses]; + if (count > received) { + NSRange r; + r.location = received; + r.length = [timeline countStatuses] - received; + [timeline removeStatusesInRange:r]; + } + } // Add messages to the timeline - for (int i = 0; i < [ary count]; ++i) { + for (int i = 0; i < received; ++i) { NSDictionary *dic = (NSDictionary*)[ary objectAtIndex:i]; if (![dic isKindOfClass:[NSDictionary class]]) { continue; @@ -266,13 +283,22 @@ [sts updateFavoriteState]; } else { - Status* sts = [Status statusWithJsonDictionary:[ary objectAtIndex:i] type:TWEET_TYPE_FAVORITES]; + sts = [Status statusWithJsonDictionary:[ary objectAtIndex:i] type:TWEET_TYPE_FAVORITES]; sts.unread = false; [sts insertDB]; } + [timeline removeStatus:sts]; } } + if (screenName == nil) { + for (int i = 0; i < [timeline countStatuses]; ++i) { + Status *sts = [timeline statusAtIndex:i]; + NSLog(@"Remove favorite:%lld:%@:%@", sts.statusId, sts.user.screenName, sts.text); + sts.favorited = false; + [sts updateFavoriteState]; + } + [timeline removeAllStatuses]; [self restore:isRestored]; } Classes/Controllers/FavoritesViewController.m @@ -102,7 +102,10 @@ timelineDataSource = [[FriendsTimelineDataSource alloc] initWithController:self tweetType:tab]; self.tableView.dataSource = timelineDataSource; self.tableView.delegate = timelineDataSource; - if (load) [self loadTimeline]; + if (load) { + [self performSelector:@selector(loadTimeline) withObject:nil afterDelay:0.01]; + } + [self.tableView reloadData]; } - (IBAction) reload:(id) sender @@ -170,6 +173,9 @@ BOOL flag = [[NSUserDefaults standardUserDefaults] boolForKey:@"autoScrollToFirstUnread"]; if (flag == false) return; + CGPoint offset = [self.tableView contentOffset]; + if (offset.y != 0) return; + if (unread) { if (unread < [timelineDataSource.timeline countStatuses]) { NSIndexPath *indexPath = [NSIndexPath indexPathForRow:unread inSection:0]; Classes/Controllers/FriendsTimelineController.m @@ -148,7 +148,7 @@ if (![dic isKindOfClass:[NSDictionary class]]) { continue; } - User *user = [[User alloc] initWithJsonDictionary:dic]; + User *user = [User userWithJsonDictionary:dic]; if (ownFriendsList) { [Followee insertDB:user]; } Classes/Controllers/FriendsViewController.m @@ -227,6 +227,7 @@ enum { dic = (NSDictionary*)obj; [user updateWithJSonDictionary:dic]; + [user updateDB]; [userView setUser:user]; detailLoaded = true; #ifndef USE_FRIENDSHIP_EXISTS_METHOD Classes/Controllers/ProfileViewController.m @@ -26,6 +26,7 @@ - (void)removeStatus:(Status*)status; - (void)removeStatusAtIndex:(int)index; +- (void)removeStatusesInRange:(NSRange)r; - (void)removeLastStatus; - (void)removeAllStatuses; Classes/Controllers/Timeline.h @@ -68,6 +68,11 @@ static NSInteger sortByDate(id a, id b, void *context) [statuses removeObjectAtIndex:index]; } +- (void)removeStatusesInRange:(NSRange)r +{ + [statuses removeObjectsInRange:r]; +} + - (void)removeAllStatuses { [statuses removeAllObjects]; Classes/Controllers/Timeline.m @@ -253,6 +253,7 @@ for (int i = 0; i < [ary count]; ++i) { Status* sts = [Status statusWithJsonDictionary:[ary objectAtIndex:i] type:TWEET_TYPE_FRIENDS]; sts.cellType = TWEET_CELL_TYPE_USER; + [sts insertDBIfFollowing]; [sts updateAttribute]; [timeline appendStatus:sts]; } Classes/Controllers/UserTimelineController.m @@ -9,8 +9,7 @@ } + (void)createEditableCopyOfDatabaseIfNeeded:(BOOL)force; -+ (void)deleteMessageCache; -+ (void)deleteImageCache; ++ (void)migrate:(NSString*)dbname to:(NSString*)newdbname queries:(NSString*)query_file; + (sqlite3*)getSharedDatabase; + (void)closeDatabase; Classes/Models/DBConnection.h @@ -1,10 +1,11 @@ #import "DBConnection.h" #import "Statement.h" +#import "TimeUtils.h" #import "TwitterFonAppDelegate.h" static sqlite3* theDatabase = nil; -#define MAIN_DATABASE_NAME @"db1.3.sql" +#define MAIN_DATABASE_NAME @"db1.4.sql" //#define TEST_DELETE_TWEET @@ -32,23 +33,27 @@ const char *delete_tweets = // Open the database. The database was prepared outside the application. if (sqlite3_open([path UTF8String], &instance) != SQLITE_OK) { // Even though the open failed, call close to properly clean up resources. + NSString *msg = [NSString stringWithUTF8String:sqlite3_errmsg(instance)]; + [[TwitterFonAppDelegate getAppDelegate] alert:@"Failed to open database" message:msg]; + NSLog(@"Failed to open database. (%@)", msg); sqlite3_close(instance); - NSLog(@"Failed to open database. (%s)", sqlite3_errmsg(instance)); - return nil; - } + instance = nil; + } + return instance; } + (sqlite3*)getSharedDatabase { if (theDatabase == nil) { + theDatabase = [self openDatabase:MAIN_DATABASE_NAME]; if (theDatabase == nil) { [DBConnection createEditableCopyOfDatabaseIfNeeded:true]; [[TwitterFonAppDelegate getAppDelegate] alert:@"Local cache error" message:@"Local cache database has been corrupted. Re-created new database."]; } - + #ifdef TEST_DELETE_TWEET char *errmsg; if (sqlite3_exec(theDatabase, delete_tweets, NULL, NULL, &errmsg) != SQLITE_OK) { @@ -59,110 +64,54 @@ const char *delete_tweets = return theDatabase; } -// -// delete caches -// -const char *delete_message_cache_sql = -"BEGIN;" -"DELETE FROM statuses;" -"DELETE FROM direct_messages;" -"DELETE FROM users;" -"DELETE FROM followees;" -"COMMIT;" -"VACUUM;"; - -+ (void)deleteMessageCache -{ - char *errmsg; - [self getSharedDatabase]; - - if (sqlite3_exec(theDatabase, delete_message_cache_sql, NULL, NULL, &errmsg) != SQLITE_OK) { - // ignore error - NSLog(@"Error: failed to cleanup chache (%s)", errmsg); - } -} - -+ (void)deleteImageCache -{ - char *errmsg; - [self getSharedDatabase]; - - if (sqlite3_exec(theDatabase, "DELETE FROM images; VACUUM;", NULL, NULL, &errmsg) != SQLITE_OK) { - // ignore error - NSLog(@"Error: failed to cleanup chache (%s)", errmsg); - } -} - -// -// cleanup and optimize -// -const char *cleanup_sql = -"BEGIN;" -"DELETE FROM images WHERE updated_at <= (SELECT updated_at FROM images order by updated_at LIMIT 1 OFFSET 5000);" -"DELETE FROM statuses WHERE type = 0 and id <= (SELECT id FROM statuses WHERE type = 0 ORDER BY id DESC LIMIT 1 OFFSET 4000);" -"DELETE FROM statuses WHERE type = 1 and id <= (SELECT id FROM statuses WHERE type = 1 ORDER BY id DESC LIMIT 1 OFFSET 1000);" -"COMMIT"; - - -const char *optimize_sql = "VACUUM; ANALYZE"; - + (void)closeDatabase { - char *errmsg; - if (theDatabase) { - if (sqlite3_exec(theDatabase, cleanup_sql, NULL, NULL, &errmsg) != SQLITE_OK) { - // ignore error - NSLog(@"Error: failed to cleanup chache (%s)", errmsg); - } - - int launchCount = [[NSUserDefaults standardUserDefaults] integerForKey:@"launchCount"]; - NSLog(@"launchCount %d", launchCount); - if (launchCount-- <= 0) { - NSLog(@"Optimize database..."); - if (sqlite3_exec(theDatabase, optimize_sql, NULL, NULL, &errmsg) != SQLITE_OK) { - NSLog(@"Error: failed to cleanup chache (%s)", errmsg); - } - launchCount = 50; - } - [[NSUserDefaults standardUserDefaults] setInteger:launchCount forKey:@"launchCount"]; - [[NSUserDefaults standardUserDefaults] synchronize]; + if (theDatabase) { sqlite3_close(theDatabase); } } -// Creates a writable copy of the bundled default database in the application Documents directory. -+ (void)createEditableCopyOfDatabaseIfNeeded:(BOOL)force ++ (void)migrate:(NSString*)dbname to:(NSString*)newdbname queries:(NSString*)query_file { - // First, test for existence. - BOOL success; NSFileManager *fileManager = [NSFileManager defaultManager]; NSError *error; NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSString *documentsDirectory = [paths objectAtIndex:0]; - NSString *writableDBPath = [documentsDirectory stringByAppendingPathComponent:MAIN_DATABASE_NAME]; - // - // migration - // - // Update from version 1.2.* - // - NSString *oldDBPath = [documentsDirectory stringByAppendingPathComponent:@"db1.2.sql"]; - success = [fileManager fileExistsAtPath:oldDBPath]; + NSString *oldDBPath = [documentsDirectory stringByAppendingPathComponent:dbname]; + NSString *writableDBPath = [documentsDirectory stringByAppendingPathComponent:newdbname]; + + BOOL success = [fileManager fileExistsAtPath:oldDBPath]; if (success) { - sqlite3 *db12 = [DBConnection openDatabase:@"db1.2.sql"]; + sqlite3 *oldDB = [DBConnection openDatabase:dbname]; char *errmsg; - NSString *migrateSQL = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"update_v12_to_v13.sql"]; + NSString *migrateSQL = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:query_file]; NSData *sqldata = [fileManager contentsAtPath:migrateSQL]; NSString *sql = [[[NSString alloc] initWithData:sqldata encoding:NSUTF8StringEncoding] autorelease]; - if (sqlite3_exec(db12, [sql UTF8String], NULL, NULL, &errmsg) == SQLITE_OK) { + if (sqlite3_exec(oldDB, [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."); + NSLog(@"Updated database (%@)", query_file); return; } - NSLog(@"Failed to update database (Reason: %s). Discard version 1.2 data...", errmsg); + NSLog(@"Failed to update database (Reason: %s). Discard %@ data...", errmsg, dbname); [fileManager removeItemAtPath:oldDBPath error:&error]; - } + } +} + +// Creates a writable copy of the bundled default database in the application Documents directory. ++ (void)createEditableCopyOfDatabaseIfNeeded:(BOOL)force +{ + // First, test for existence. + BOOL success; + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSError *error; + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *documentsDirectory = [paths objectAtIndex:0]; + NSString *writableDBPath = [documentsDirectory stringByAppendingPathComponent:MAIN_DATABASE_NAME]; + + [DBConnection migrate:@"db1.2.sql" to:@"db1.3.sql" queries:@"update_v12_to_v13.sql"]; + [DBConnection migrate:@"db1.3.sql" to:@"db1.4.sql" queries:@"update_v13_to_v14.sql"]; if (force) { [fileManager removeItemAtPath:writableDBPath error:&error]; @@ -188,8 +137,10 @@ const char *optimize_sql = "VACUUM; ANALYZE"; + (void)commitTransaction { - char *errmsg; + char *errmsg; + Stopwatch *sw = [Stopwatch stopwatch]; sqlite3_exec(theDatabase, "COMMIT", NULL, NULL, &errmsg); + [sw lap:@"COMMIT"]; } + (Statement*)statementWithQuery:(const char *)sql Classes/Models/DBConnection.m @@ -50,9 +50,41 @@ } } ++ (BOOL)needUpdate:(User*)user +{ + static Statement *stmt = nil; + if (stmt == nil) { + stmt = [DBConnection statementWithQuery:"SELECT * FROM followees WHERE user_id = ?"]; + [stmt retain]; + } + [stmt bindInt32:user.userId forIndex:1]; + int ret = [stmt step]; + if (ret != SQLITE_ROW) { + [stmt reset]; + return true; + } + + Followee *f = [Followee initWithStatement:stmt]; + [f autorelease]; + [stmt reset]; + + if ([f.profileImageUrl isEqualToString:user.profileImageUrl] && + [f.screenName isEqualToString:user.screenName] && + [f.name isEqualToString:user.name]) { + return false; + } + else { + return true; + } +} + + (void)insertDB:(User*)user { static Statement *stmt = nil; + + if (![Followee needUpdate:user]) { + return; + } if (stmt == nil) { stmt = [DBConnection statementWithQuery:"REPLACE INTO followees VALUES(?, ?, ?, ?)"]; [stmt retain]; Classes/Models/Followee.m @@ -13,6 +13,7 @@ // @interface Statement : NSObject { + NSString* query; sqlite3_stmt* stmt; } Classes/Models/Statement.h @@ -6,17 +6,23 @@ // Copyright 2008 naan studio. All rights reserved. // +#import "DBConnection.h" #import "Statement.h" +#import "TimeUtils.h" +//#define DEBUG_QUERY @implementation Statement - (id)initWithDB:(sqlite3*)db query:(const char*)sql { self = [super init]; - +#ifdef DEBUG_QUERY + query = [[NSString alloc] initWithUTF8String:sql]; +#endif if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) { - NSAssert2(0, @"Failed to prepare statement '%s' (%s)", sql, sqlite3_errmsg(db)); + NSLog(@"Failed to prepare statement '%s' (SQL Error: %s)", sql, sqlite3_errmsg(db)); + [DBConnection alert]; } return self; } @@ -28,7 +34,16 @@ - (int)step { - return sqlite3_step(stmt); +#ifdef DEBUG_QUERY + Stopwatch *sw = [Stopwatch stopwatch]; +#endif + int result = sqlite3_step(stmt); +#ifdef DEBUG_QUERY + if ([sw diff] > 100 * 1000) { + [sw lap:query]; + } +#endif + return result; } - (void)reset @@ -38,6 +53,9 @@ - (void)dealloc { +#ifdef DEBUG_QUERY + [query release]; +#endif sqlite3_finalize(stmt); [super dealloc]; } Classes/Models/Statement.m @@ -266,15 +266,18 @@ int sTextWidth[] = { if (inReplyTo == 0) inReplyTo = -1; -// static char *sql = "SELECT count(*) FROM statuses WHERE id = ? OR in_reply_to_status_id = ?"; - static char *sql = "SELECT count(*) FROM statuses WHERE id = ?"; +// static char *sql = "SELECT id FROM statuses WHERE id = ? OR in_reply_to_status_id = ?"; + static char *sql = "SELECT id FROM statuses WHERE id = ?"; Statement *stmt = [DBConnection statementWithQuery:sql]; [stmt bindInt64:inReplyToStatusId forIndex:1]; // [stmt bindInt64:tweetId forIndex:2]; - [stmt step]; - - return [stmt getInt32:0]; + if ([stmt step] == SQLITE_ROW) { + return true; + } + else { + return false; + } } - (int)getConversation:(NSMutableArray*)messages @@ -294,20 +297,15 @@ int sTextWidth[] = { INIT_STOPWATCH(s); while ([idArray count]) { - - NSString *replies = [idArray componentsJoinedByString:@","]; - NSString *ids = [replyArray componentsJoinedByString:@","]; + NSString *replies = [idArray componentsJoinedByString:@","]; [idArray removeAllObjects]; - [replyArray removeAllObjects]; - NSString *sql = [NSString stringWithFormat:@"SELECT * FROM statuses WHERE id IN (%@) OR in_reply_to_status_id IN (%@)", ids, replies]; + NSString* sql = [NSString stringWithFormat:@"SELECT * FROM statuses WHERE in_reply_to_status_id IN (%@)", replies]; Statement *stmt = [DBConnection statementWithQuery:[sql UTF8String]]; - //NSLog(@"Exec %@", sql); while ([stmt step] == SQLITE_ROW) { NSString *idStr = [NSString stringWithFormat:@"%lld", [stmt getInt64:0]]; - //NSLog(@"Found %@", idStr); if (![hash objectForKey:idStr]) { Status *s = [Status initWithStatement:stmt type:TWEET_TYPE_FRIENDS]; [hash setObject:s forKey:idStr]; @@ -317,11 +315,33 @@ int sTextWidth[] = { [replyArray addObject:[NSNumber numberWithLongLong:s.inReplyToStatusId]]; } - // Up to 100 messages if (++count >= 100) break; } } [stmt reset]; + + if ([replyArray count]) { + NSString *ids = [replyArray componentsJoinedByString:@","]; + [replyArray removeAllObjects]; + sql = [NSString stringWithFormat:@"SELECT * FROM statuses WHERE id IN (%@)", ids]; + stmt = [DBConnection statementWithQuery:[sql UTF8String]]; + + while ([stmt step] == SQLITE_ROW) { + NSString *idStr = [NSString stringWithFormat:@"%lld", [stmt getInt64:0]]; + if (![hash objectForKey:idStr]) { + Status *s = [Status initWithStatement:stmt type:TWEET_TYPE_FRIENDS]; + [hash setObject:s forKey:idStr]; + [messages addObject:s]; + [idArray addObject:[NSNumber numberWithLongLong:s.tweetId]]; + if (s.inReplyToStatusId) { + [replyArray addObject:[NSNumber numberWithLongLong:s.inReplyToStatusId]]; + } + + if (++count >= 100) break; + } + } + [stmt reset]; + } } LAP(s, @"Decode conversation"); @@ -387,10 +407,16 @@ int sTextWidth[] = { - (void)updateFavoriteState { - Statement *stmt = [DBConnection statementWithQuery:"UPDATE statuses SET favorited = ? WHERE id = ?"]; + static Statement *stmt = nil; + if (stmt == nil) { + stmt = [DBConnection statementWithQuery:"UPDATE statuses SET favorited = ? WHERE id = ?"]; + [stmt retain]; + } + [stmt bindInt32:favorited forIndex:1]; [stmt bindInt64:tweetId forIndex:2]; [stmt step]; // ignore error + [stmt reset]; } @end Classes/Models/Status.m @@ -18,6 +18,8 @@ BOOL notifications; BOOL protected; BOOL following; + + BOOL needUpdate; } @property (nonatomic, assign) uint32_t userId; @@ -35,12 +37,12 @@ @property (nonatomic, assign) BOOL following; @property (nonatomic, assign) BOOL notifications; +@property (nonatomic, assign) BOOL needUpdate; + + (User*)userWithId:(int)id; + (User*)userWithJsonDictionary:(NSDictionary*)dic; + (User*)userWithSearchResult:(NSDictionary*)dic; -- (User*)initWithJsonDictionary:(NSDictionary*)dic; -- (User*)initWithSearchResult:(NSDictionary*)dic; - (void)updateWithJSonDictionary:(NSDictionary*)dic; - (void)updateDB; Classes/Models/User.h @@ -19,8 +19,52 @@ @synthesize favoritesCount; @synthesize following; @synthesize notifications; +@synthesize needUpdate; -- (void)updateWithJSonDictionary:(NSDictionary*)dic +- (void)checkUpdate:(User*)user +{ + needUpdate = false; + + if (![profileImageUrl isEqualToString:user.profileImageUrl]) { + self.profileImageUrl = user.profileImageUrl; + needUpdate = true; + } + if (![screenName isEqualToString:user.screenName]) { + self.screenName = user.screenName; + needUpdate = true; + } + if (![name isEqualToString:user.name]) { + self.name = user.name; + needUpdate = true; + } + if (![location isEqualToString:user.location]) { + self.location = user.location; + needUpdate = true; + } + if (![description isEqualToString:user.description]) { + self.description = user.description; + needUpdate = true; + } + if (![url isEqualToString:user.url]) { + self.url = user.url; + needUpdate = true; + } + if (protected != user.protected) { + self.protected = user.protected; + needUpdate = true; + } + if (followersCount != user.followersCount) { + self.followersCount = user.followersCount; + needUpdate = true; + } + + self.friendsCount = user.friendsCount; + self.statusesCount = user.statusesCount; + self.favoritesCount = user.favoritesCount; + self.following = user.following; +} + +- (void)initWithJsonDictionary:(NSDictionary*)dic { [name release]; [screenName release]; @@ -62,13 +106,12 @@ [profileImageUrl retain]; } -- (User*)initWithJsonDictionary:(NSDictionary*)dic +- (void)updateWithJSonDictionary:(NSDictionary*)dic { - self = [super init]; - - [self updateWithJSonDictionary:dic]; - - return self; + User *u = [[User alloc] init]; + [u initWithJsonDictionary:dic]; + [self checkUpdate:u]; + [u release]; } - (User*)initWithSearchResult:(NSDictionary*)dic @@ -139,7 +182,17 @@ return u; } - u = [[User alloc] initWithJsonDictionary:dic]; + u = [User userWithId:[[dic objectForKey:@"id"] longValue]]; + + if (u) { + [UserStore setUser:u]; + [u updateWithJSonDictionary:dic]; + return u; + } + + u = [[User alloc] init]; + [u initWithJsonDictionary:dic]; + u.needUpdate = true; [UserStore setUser:u]; return u; } @@ -156,6 +209,8 @@ - (void)updateDB { + if (!needUpdate) return; + static Statement *stmt = nil; if (stmt == nil) { stmt = [DBConnection statementWithQuery:"REPLACE INTO users VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)"]; Classes/Models/User.m @@ -15,6 +15,7 @@ } + (Stopwatch*) stopwatch; +- (uint64_t)diff; - (void) lap:(NSString*)message; @end Classes/OtherSources/TimeUtils.h @@ -25,14 +25,19 @@ return [[[Stopwatch alloc] init] autorelease]; } -- (void) lap:(NSString*)message +- (uint64_t)diff { -#ifndef DISTRIBUTION gettimeofday(&tv2, NULL); - - uint64_t sec = tv2.tv_sec - tv1.tv_sec; - uint64_t diff = sec * 1000 * 1000 + (tv2.tv_usec - tv1.tv_usec); + uint64_t sec = tv2.tv_sec - tv1.tv_sec; + uint64_t diff = sec * 1000 * 1000 + (tv2.tv_usec - tv1.tv_usec); + return diff; +} + +- (void) lap:(NSString*)message +{ +#ifndef DISTRIBUTION + uint64_t diff = [self diff]; NSLog(@"%@ (%lld.%06lld)", message, diff / 1000000, diff % 1000000); #endif } Classes/OtherSources/TimeUtils.m @@ -36,6 +36,10 @@ typedef enum { NSDate* lastRefreshDate; NSString* screenName; + + BOOL needOptimizeDB; + IBOutlet UIWindow* HUD; + IBOutlet UIActivityIndicatorView* spinner; } - (IBAction)post:(id)sender; Classes/OtherSources/TwitterFonAppDelegate.h @@ -18,7 +18,6 @@ #import "ColorUtils.h" #import "REString.h" - @interface NSObject (TwitterFonAppDelegateDelegate) - (void)didLeaveTab:(UINavigationController*)navigationController; - (void)didSelectTab:(UINavigationController*)navigationController; @@ -45,29 +44,24 @@ [self initializeUserDefaults]; BOOL forceCreate = [[NSUserDefaults standardUserDefaults] boolForKey:@"clearLocalCache"]; - [DBConnection createEditableCopyOfDatabaseIfNeeded:forceCreate]; - [DBConnection getSharedDatabase]; [[NSUserDefaults standardUserDefaults] setBool:false forKey:@"clearLocalCache"]; NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username"]; NSString *prevUsername = [[NSUserDefaults standardUserDefaults] stringForKey:@"prevUsername"]; NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password"]; - - BOOL needDeleteMessageCache = false; if (prevUsername != nil && [username caseInsensitiveCompare:prevUsername] != NSOrderedSame) { - needDeleteMessageCache = true; + forceCreate = true; } NSString *versionStr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; [[NSUserDefaults standardUserDefaults] setObject:versionStr forKey:@"appVersion"]; - [[NSUserDefaults standardUserDefaults] setObject:username forKey:@"prevUsername"]; - [[NSUserDefaults standardUserDefaults] synchronize]; + + [DBConnection createEditableCopyOfDatabaseIfNeeded:forceCreate]; + [DBConnection getSharedDatabase]; - if (needDeleteMessageCache) { - [DBConnection deleteMessageCache]; - } + [[NSUserDefaults standardUserDefaults] synchronize]; [UIColor initTwitterFonColorScheme]; imageStore = [[ImageStore alloc] init]; @@ -76,37 +70,14 @@ tabBarController.selectedIndex = TAB_FRIENDS; [window addSubview:tabBarController.view]; + [window makeKeyAndVisible]; + HUD.hidden = true; if ([username length] == 0 || [password length] == 0) { [self openSettingsView]; } else { - [self postInit]; - } -} - -- (void)initializeUserDefaults -{ - NSDictionary* dic = [NSDictionary dictionaryWithObjectsAndKeys: - @"", @"username", - @"", @"password", - [NSNumber numberWithBool:false], @"clearLocalCache", - [NSNumber numberWithBool:true], @"loadAllTabOnLaunch", - [NSNumber numberWithBool:true], @"autoScrollToFirstUnread", - [NSNumber numberWithInt:5], @"autoRefresh", - @"", @"tweet", - [NSNumber numberWithLongLong:0], @"inReplyToStatusId", - @"", @"to", - @"", @"recipient", - [NSNumber numberWithInt:2], @"searchDistance", - [NSNumber numberWithInt:50], @"launchCount", - [NSNumber numberWithInt:13], @"fontSize", - nil]; - - for (id key in dic) { - if ([[NSUserDefaults standardUserDefaults] objectForKey:key] == nil) { - [[NSUserDefaults standardUserDefaults] setObject:[dic objectForKey:key] forKey:key]; - } + [self performSelector:@selector(postInit) withObject:nil afterDelay:0.01]; } } @@ -141,6 +112,30 @@ initialized = true; } +- (void)initializeUserDefaults +{ + NSDictionary* dic = [NSDictionary dictionaryWithObjectsAndKeys: + @"", @"username", + @"", @"password", + [NSNumber numberWithBool:false], @"clearLocalCache", + [NSNumber numberWithBool:true], @"loadAllTabOnLaunch", + [NSNumber numberWithBool:true], @"autoScrollToFirstUnread", + [NSNumber numberWithInt:5], @"autoRefresh", + @"", @"tweet", + [NSNumber numberWithLongLong:0], @"inReplyToStatusId", + @"", @"to", + @"", @"recipient", + [NSNumber numberWithInt:2], @"searchDistance", + [NSNumber numberWithInt:13], @"fontSize", + nil]; + + for (id key in dic) { + if ([[NSUserDefaults standardUserDefaults] objectForKey:key] == nil) { + [[NSUserDefaults standardUserDefaults] setObject:[dic objectForKey:key] forKey:key]; + } + } +} + - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url { UINavigationController* nav = (UINavigationController*)[tabBarController.viewControllers objectAtIndex:selectedTab]; @@ -168,6 +163,7 @@ if ([method isEqualToString:@"search"]) { [self search:[url query]]; } + return YES; } @@ -179,7 +175,8 @@ - (void)postURLWithoutConvert:(NSURL*)url { - [self.postView editWithMessage:[url query]]; + NSString* message = [url query]; + [self.postView editWithMessage:[message stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; [url release]; } Classes/OtherSources/TwitterFonAppDelegate.m @@ -32,7 +32,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.4.1</string> + <string>1.4.4</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSMainNibFile</key> Info.plist @@ -1,19 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02"> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">512</int> <string key="IBDocument.SystemVersion">9G55</string> - <string key="IBDocument.InterfaceBuilderVersion">672</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> <string key="IBDocument.AppKitVersion">949.43</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="421"/> + <integer value="423"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBProxyObject" id="841351856"> @@ -233,6 +243,63 @@ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> <bool key="IBUIVisibleAtLaunch">YES</bool> </object> + <object class="IBUIWindow" id="768687225"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">1316</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBUIActivityIndicatorView" id="890556410"> + <reference key="NSNextResponder" ref="768687225"/> + <int key="NSvFlags">1316</int> + <string key="NSFrame">{{140, 218}, {37, 37}}</string> + <reference key="NSSuperview" ref="768687225"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <bool key="IBUIHidesWhenStopped">NO</bool> + <bool key="IBUIAnimating">YES</bool> + <int key="IBUIStyle">0</int> + </object> + <object class="IBUILabel" id="731558494"> + <reference key="NSNextResponder" ref="768687225"/> + <int key="NSvFlags">1316</int> + <string key="NSFrame">{{41, 129}, {235, 63}}</string> + <reference key="NSSuperview" ref="768687225"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="IBUIText">Optimizing local cache database. Please wait...</string> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica</string> + <double key="NSSize">2.000000e+01</double> + <int key="NSfFlags">16</int> + </object> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <object class="NSColorSpace" key="NSCustomColorSpace"> + <int key="NSID">1</int> + </object> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">1</int> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <float key="IBUIMinimumFontSize">2.000000e+01</float> + <int key="IBUINumberOfLines">3</int> + <int key="IBUITextAlignment">1</int> + </object> + </object> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrameSize">{320, 480}</string> + <reference key="NSSuperview"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAgMC43NQA</bytes> + </object> + <bool key="IBUIClipsSubviews">YES</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> + <bool key="IBUIVisibleAtLaunch">YES</bool> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -341,6 +408,22 @@ </object> <int key="connectionID">422</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">HUD</string> + <reference key="source" ref="664661524"/> + <reference key="destination" ref="768687225"/> + </object> + <int key="connectionID">426</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">spinner</string> + <reference key="source" ref="664661524"/> + <reference key="destination" ref="890556410"/> + </object> + <int key="connectionID">427</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -444,6 +527,7 @@ <int key="objectID">2</int> <reference key="object" ref="380026005"/> <reference key="parent" ref="957960031"/> + <string key="objectName">MainWindow</string> </object> <object class="IBObjectRecord"> <int key="objectID">193</int> @@ -637,6 +721,27 @@ <reference key="object" ref="205447070"/> <reference key="parent" ref="619424054"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">423</int> + <reference key="object" ref="768687225"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="890556410"/> + <reference ref="731558494"/> + </object> + <reference key="parent" ref="957960031"/> + <string key="objectName">HUD</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">425</int> + <reference key="object" ref="890556410"/> + <reference key="parent" ref="768687225"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">424</int> + <reference key="object" ref="731558494"/> + <reference key="parent" ref="768687225"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -672,6 +777,12 @@ <string>416.IBPluginDependency</string> <string>418.IBPluginDependency</string> <string>421.IBPluginDependency</string> + <string>423.IBAttributePlaceholdersKey</string> + <string>423.IBEditorWindowLastContentRect</string> + <string>423.IBPluginDependency</string> + <string>423.UIWindow.visibleAtLaunch</string> + <string>424.IBPluginDependency</string> + <string>425.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -712,6 +823,20 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <object class="NSMutableDictionary"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <string>{{645, 551}, {320, 480}}</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -734,7 +859,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">422</int> + <int key="maxID">427</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -813,11 +938,15 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>HUD</string> + <string>spinner</string> <string>tabBarController</string> <string>window</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>UIWindow</string> + <string>UIActivityIndicatorView</string> <string>UITabBarController</string> <string>UIWindow</string> </object> Interfaces/MainWindow.xib @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02"> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">512</int> - <string key="IBDocument.SystemVersion">9F33</string> - <string key="IBDocument.InterfaceBuilderVersion">672</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.SystemVersion">9G55</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="65"/> @@ -16,6 +16,15 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBProxyObject" id="372490531"> @@ -69,6 +78,8 @@ </object> <float key="IBUIMinimumFontSize">1.700000e+01</float> <object class="IBUITextInputTraits" key="IBUITextInputTraits"> + <int key="IBUIAutocorrectionType">1</int> + <int key="IBUIKeyboardType">1</int> <bool key="IBUIEnablesReturnKeyAutomatically">YES</bool> </object> </object> @@ -431,32 +442,21 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Classes/JSON/NSObject+SBJSON.h</string> + <string key="minorKey">Classes/OtherSources/JSON/NSObject+SBJSON.h</string> </object> </object> <object class="IBPartialClassDescription"> <string key="className">SettingsViewController</string> <string key="superclassName">UIViewController</string> <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>done:</string> - <string>toggleLoadAlltab:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - </object> + <string key="NS.key.0">done:</string> + <string key="NS.object.0">id</string> </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>autoRefresh</string> <string>doneButton</string> - <string>loadAllTab</string> <string>password</string> <string>passwordField</string> <string>username</string> @@ -464,10 +464,8 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>UITableViewCell</string> <string>UIBarButtonItem</string> <string>UITableViewCell</string> - <string>UITableViewCell</string> <string>UITextField</string> <string>UITableViewCell</string> <string>UITextField</string> Interfaces/SettingsView.xib @@ -37,7 +37,9 @@ 6E1C730B0EB5AEC800E34D9B /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E1C730A0EB5AEC800E34D9B /* CoreLocation.framework */; }; 6E1C73C20EB5B77700E34D9B /* location.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E1C73C10EB5B77700E34D9B /* location.png */; }; 6E1C78890EB7063900E34D9B /* trends.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E1C78880EB7063900E34D9B /* trends.png */; }; - 6E1FAE8D0EDAC4D7009407F6 /* db1.3.sql in Resources */ = {isa = PBXBuildFile; fileRef = 6E1FAE8C0EDAC4D7009407F6 /* db1.3.sql */; }; + 6E209B510F53DC7F00B32E7B /* db1.4.sql in Resources */ = {isa = PBXBuildFile; fileRef = 6E209B4E0F53DC7F00B32E7B /* db1.4.sql */; }; + 6E209B520F53DC7F00B32E7B /* update_v12_to_v13.sql in Resources */ = {isa = PBXBuildFile; fileRef = 6E209B4F0F53DC7F00B32E7B /* update_v12_to_v13.sql */; }; + 6E209B530F53DC7F00B32E7B /* update_v13_to_v14.sql in Resources */ = {isa = PBXBuildFile; fileRef = 6E209B500F53DC7F00B32E7B /* update_v13_to_v14.sql */; }; 6E2BCF260E3596D4003A8F69 /* friends.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E2BCF250E3596D4003A8F69 /* friends.png */; }; 6E2BD0C10E35AE04003A8F69 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E2BD0C00E35AE04003A8F69 /* QuartzCore.framework */; }; 6E2BD11F0E35B3D2003A8F69 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E2BD11E0E35B3D2003A8F69 /* Default.png */; }; @@ -88,7 +90,6 @@ 6E97ABBE0EF91F6C00168291 /* Balloon_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E97ABBC0EF91F6C00168291 /* Balloon_2.png */; }; 6E97ABBF0EF91F6C00168291 /* Balloon_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E97ABBD0EF91F6C00168291 /* Balloon_1.png */; }; 6E97ABE40EF920FE00168291 /* ChatBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97ABE30EF920FE00168291 /* ChatBubbleView.m */; }; - 6E97AD160EF93AB800168291 /* update_v12_to_v13.sql in Resources */ = {isa = PBXBuildFile; fileRef = 6E97AD150EF93AB800168291 /* update_v12_to_v13.sql */; }; 6E97AD680EF94B5000168291 /* DirectMessageCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97AD670EF94B5000168291 /* DirectMessageCellView.m */; }; 6E97AD750EF94CE800168291 /* DirectMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97AD740EF94CE800168291 /* DirectMessageCell.m */; }; 6EA0C19C0EBB1305000C0CD4 /* friends_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 6EA0C19B0EBB1305000C0CD4 /* friends_small.png */; }; @@ -189,7 +190,9 @@ 6E1C730A0EB5AEC800E34D9B /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 6E1C73C10EB5B77700E34D9B /* location.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = location.png; sourceTree = "<group>"; }; 6E1C78880EB7063900E34D9B /* trends.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trends.png; sourceTree = "<group>"; }; - 6E1FAE8C0EDAC4D7009407F6 /* db1.3.sql */ = {isa = PBXFileReference; lastKnownFileType = file; path = db1.3.sql; sourceTree = "<group>"; }; + 6E209B4E0F53DC7F00B32E7B /* db1.4.sql */ = {isa = PBXFileReference; lastKnownFileType = file; name = db1.4.sql; path = db/db1.4.sql; sourceTree = "<group>"; }; + 6E209B4F0F53DC7F00B32E7B /* update_v12_to_v13.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = update_v12_to_v13.sql; path = db/update_v12_to_v13.sql; sourceTree = "<group>"; }; + 6E209B500F53DC7F00B32E7B /* update_v13_to_v14.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = update_v13_to_v14.sql; path = db/update_v13_to_v14.sql; sourceTree = "<group>"; }; 6E2BCF250E3596D4003A8F69 /* friends.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = friends.png; sourceTree = "<group>"; }; 6E2BD0C00E35AE04003A8F69 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 6E2BD11E0E35B3D2003A8F69 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; }; @@ -262,7 +265,6 @@ 6E97ABBD0EF91F6C00168291 /* Balloon_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Balloon_1.png; sourceTree = "<group>"; }; 6E97ABE20EF920FE00168291 /* ChatBubbleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChatBubbleView.h; path = Controllers/ChatBubbleView.h; sourceTree = "<group>"; }; 6E97ABE30EF920FE00168291 /* ChatBubbleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ChatBubbleView.m; path = Controllers/ChatBubbleView.m; sourceTree = "<group>"; }; - 6E97AD150EF93AB800168291 /* update_v12_to_v13.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = update_v12_to_v13.sql; sourceTree = "<group>"; }; 6E97AD660EF94B5000168291 /* DirectMessageCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectMessageCellView.h; path = Controllers/DirectMessageCellView.h; sourceTree = "<group>"; }; 6E97AD670EF94B5000168291 /* DirectMessageCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectMessageCellView.m; path = Controllers/DirectMessageCellView.m; sourceTree = "<group>"; }; 6E97AD730EF94CE800168291 /* DirectMessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectMessageCell.h; path = Controllers/DirectMessageCell.h; sourceTree = "<group>"; }; @@ -435,12 +437,11 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 8D1107310486CEB800E47090 /* Info.plist */, 6E3EAB9F0EC8782400599954 /* dist.plist */, 6ECCAD9D0EBE5B53002B39F6 /* interfaces */, 6EED14400E33E5BF00C71EA4 /* Images */, - 8D1107310486CEB800E47090 /* Info.plist */, - 6E1FAE8C0EDAC4D7009407F6 /* db1.3.sql */, - 6E97AD150EF93AB800168291 /* update_v12_to_v13.sql */, + 6E209B550F53DC8900B32E7B /* db */, 6E382E930EB41E9000B0CE69 /* Settings.bundle */, ); name = Resources; @@ -561,6 +562,16 @@ name = Profile; sourceTree = "<group>"; }; + 6E209B550F53DC8900B32E7B /* db */ = { + isa = PBXGroup; + children = ( + 6E209B4E0F53DC7F00B32E7B /* db1.4.sql */, + 6E209B4F0F53DC7F00B32E7B /* update_v12_to_v13.sql */, + 6E209B500F53DC7F00B32E7B /* update_v13_to_v14.sql */, + ); + name = db; + sourceTree = "<group>"; + }; 6E38EF7F0E38275300887690 /* Web */ = { isa = PBXGroup; children = ( @@ -964,7 +975,6 @@ 6E6DC5A50EC077FD00F9EB74 /* FolloweesView.xib in Resources */, 6E6DC6240EC07F3D00F9EB74 /* camera.png in Resources */, 6E3EABA00EC8782400599954 /* dist.plist in Resources */, - 6E1FAE8D0EDAC4D7009407F6 /* db1.3.sql in Resources */, 6E89F34A0EDD230A00778242 /* search_shadow.png in Resources */, 6E89F5EC0EDD58BF00778242 /* location_small.png in Resources */, 6E89F8A90EDE33B600778242 /* BookmarksPressed.png in Resources */, @@ -986,10 +996,12 @@ 6E97A8820EF8F7DA00168291 /* DirectMessage.xib in Resources */, 6E97ABBE0EF91F6C00168291 /* Balloon_2.png in Resources */, 6E97ABBF0EF91F6C00168291 /* Balloon_1.png in Resources */, - 6E97AD160EF93AB800168291 /* update_v12_to_v13.sql in Resources */, 6E79DE330F0DB173006E0525 /* EarlierButton.png in Resources */, 6E79DE3D0F0DB746006E0525 /* EalierButtonPressed.png in Resources */, 6EC2637C0F0F989500C31A13 /* FavoritesView.xib in Resources */, + 6E209B510F53DC7F00B32E7B /* db1.4.sql in Resources */, + 6E209B520F53DC7F00B32E7B /* update_v12_to_v13.sql in Resources */, + 6E209B530F53DC7F00B32E7B /* update_v13_to_v14.sql in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1131,7 +1143,7 @@ OTHER_CFLAGS = "-DDISTRIBUTION"; PREBINDING = NO; PROVISIONING_PROFILE = "42A792DA-77DF-44D4-881C-8298379DD187"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "42A792DA-77DF-44D4-881C-8298379DD187"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "C6EA6298-E7AA-4BF7-B32F-79E98AFE1081"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO; SDKROOT = iphoneos2.0; }; @@ -1167,6 +1179,7 @@ PREBINDING = NO; PROVISIONING_PROFILE = "0F74D6AA-1337-43EC-9E34-0AFB081302DE"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "0F74D6AA-1337-43EC-9E34-0AFB081302DE"; + "PROVISIONING_PROFILE[sdk=iphoneos2.0]" = "C6EA6298-E7AA-4BF7-B32F-79E98AFE1081"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO; SDKROOT = iphoneos2.0; }; TwitterFon.xcodeproj/project.pbxproj 58905d4036362db9732eebd06e90e182b1200652 Robert Gogolok gogolok@googlemail.com http://github.com/jpick/gogotwitter/commit/7e40e2645656e9866a5773478be6bd36bd443b90 7e40e2645656e9866a5773478be6bd36bd443b90 2009-04-17T10:57:50-07:00 2009-04-17T10:57:50-07:00 Last kown GPL 2 code of TwitterFon by kaz Should be version 1.4.4 3066024f703f696ef1f7e2224886aaf0bfa5fc42 Robert Gogolok gogolok@googlemail.com