diff options
16 files changed, 58 insertions, 27 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index 9b312f28..117cc83b 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -3861,7 +3861,7 @@ C64EA52E169E772200778456 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0610; ORGANIZATIONNAME = MailCore; TargetAttributes = { C6B5AE0119F630B3001352A6 = { @@ -4765,6 +4765,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; + COMBINE_HIDPI_IMAGES = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -4798,6 +4799,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; + COMBINE_HIDPI_IMAGES = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; diff --git a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/mailcore osx.xcscheme b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/mailcore osx.xcscheme index dfa632fb..40362a48 100644 --- a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/mailcore osx.xcscheme +++ b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/mailcore osx.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0510" + LastUpgradeVersion = "0610" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -39,6 +39,15 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "C6BD288C170BD71100A91AC1" + BuildableName = "MailCore.framework" + BlueprintName = "mailcore osx" + ReferencedContainer = "container:mailcore2.xcodeproj"> + </BuildableReference> + </MacroExpansion> <AdditionalOptions> </AdditionalOptions> </LaunchAction> diff --git a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 ios.xcscheme b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 ios.xcscheme index 308d9031..c0e8e223 100644 --- a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 ios.xcscheme +++ b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 ios.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0510" + LastUpgradeVersion = "0610" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -39,6 +39,15 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "C6BA2B091705F4E6003F0E9E" + BuildableName = "libMailCore-ios.a" + BlueprintName = "static mailcore2 ios" + ReferencedContainer = "container:mailcore2.xcodeproj"> + </BuildableReference> + </MacroExpansion> <AdditionalOptions> </AdditionalOptions> </LaunchAction> diff --git a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 osx.xcscheme b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 osx.xcscheme index 0f03d9d8..3107b4a3 100644 --- a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 osx.xcscheme +++ b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/static mailcore2 osx.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0510" + LastUpgradeVersion = "0610" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -39,6 +39,15 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "C64EA536169E772200778456" + BuildableName = "libMailCore.a" + BlueprintName = "static mailcore2 osx" + ReferencedContainer = "container:mailcore2.xcodeproj"> + </BuildableReference> + </MacroExpansion> <AdditionalOptions> </AdditionalOptions> </LaunchAction> diff --git a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/test-ios.xcscheme b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/test-ios.xcscheme index 197bb83a..4a32a752 100644 --- a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/test-ios.xcscheme +++ b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/test-ios.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0510" + LastUpgradeVersion = "0610" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/tests.xcscheme b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/tests.xcscheme index 2e6592c3..8dfc0654 100644 --- a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/tests.xcscheme +++ b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/tests.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0510" + LastUpgradeVersion = "0610" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/unittest.xcscheme b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/unittest.xcscheme index e90e0367..375e55bd 100644 --- a/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/unittest.xcscheme +++ b/build-mac/mailcore2.xcodeproj/xcshareddata/xcschemes/unittest.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0600" + LastUpgradeVersion = "0610" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/src/async/nntp/MCNNTPAsyncSession.cc b/src/async/nntp/MCNNTPAsyncSession.cc index b14e1970..5c3aa36a 100644 --- a/src/async/nntp/MCNNTPAsyncSession.cc +++ b/src/async/nntp/MCNNTPAsyncSession.cc @@ -204,7 +204,7 @@ NNTPFetchOverviewOperation * NNTPAsyncSession::fetchOverviewOperationWithIndexes return op; } -NNTPFetchServerTimeOperation * NNTPAsyncSession::fetchServerTimeOperation() +NNTPFetchServerTimeOperation * NNTPAsyncSession::fetchServerDateOperation() { NNTPFetchServerTimeOperation * op = new NNTPFetchServerTimeOperation(); op->setSession(this); diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h index c92e09ee..bbcc4036 100644 --- a/src/async/nntp/MCNNTPAsyncSession.h +++ b/src/async/nntp/MCNNTPAsyncSession.h @@ -62,7 +62,7 @@ namespace mailcore { virtual NNTPFetchOverviewOperation * fetchOverviewOperationWithIndexes(String * groupName, IndexSet * indexes); - virtual NNTPFetchServerTimeOperation * fetchServerTimeOperation(); + virtual NNTPFetchServerTimeOperation * fetchServerDateOperation(); virtual NNTPListNewsgroupsOperation * listAllNewsgroupsOperation(); virtual NNTPListNewsgroupsOperation * listDefaultNewsgroupsOperation(); diff --git a/src/async/nntp/MCNNTPFetchOverviewOperation.h b/src/async/nntp/MCNNTPFetchOverviewOperation.h index 0582864d..aab8d24b 100644 --- a/src/async/nntp/MCNNTPFetchOverviewOperation.h +++ b/src/async/nntp/MCNNTPFetchOverviewOperation.h @@ -35,7 +35,7 @@ namespace mailcore { private: IndexSet * mIndexes; String * mGroupName; - Array * /* NNTPGroupInfo */ mArticles; + Array * /* MessageHeader */ mArticles; }; } diff --git a/src/async/nntp/MCNNTPFetchServerTimeOperation.cc b/src/async/nntp/MCNNTPFetchServerTimeOperation.cc index a2729f48..86800733 100644 --- a/src/async/nntp/MCNNTPFetchServerTimeOperation.cc +++ b/src/async/nntp/MCNNTPFetchServerTimeOperation.cc @@ -29,6 +29,6 @@ time_t NNTPFetchServerTimeOperation::time() void NNTPFetchServerTimeOperation::main() { ErrorCode error; - mTime = session()->session()->fetchServerClockTime(&error); + mTime = session()->session()->fetchServerDate(&error); setError(error); } diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h index 9014f992..1b45ea69 100644 --- a/src/core/abstract/MCMessageConstants.h +++ b/src/core/abstract/MCMessageConstants.h @@ -249,7 +249,7 @@ namespace mailcore { ErrorNoRecipient, ErrorNoop, ErrorGmailApplicationSpecificPasswordRequired, - ErrorBadResponse, + ErrorServerDate, }; enum PartType { diff --git a/src/core/nntp/MCNNTPSession.cc b/src/core/nntp/MCNNTPSession.cc index b0d3776f..3c7ea7a3 100644 --- a/src/core/nntp/MCNNTPSession.cc +++ b/src/core/nntp/MCNNTPSession.cc @@ -368,9 +368,10 @@ Array * NNTPSession::listDefaultNewsgroups(ErrorCode * pError) MCLog("fetch subscribed"); loginIfNeeded(pError); - if (* pError != ErrorNone) + if (* pError != ErrorNone) { return NULL; - + } + r = newsnntp_list_subscriptions(mNNTP, &subd_groups); MCLog("fetch subscribed %u", r); @@ -392,10 +393,11 @@ Array * NNTPSession::listDefaultNewsgroups(ErrorCode * pError) } newsnntp_list_subscriptions_free(subd_groups); * pError = ErrorNone; - + return result; } + MessageHeader * NNTPSession::fetchHeader(String *groupName, unsigned int index, ErrorCode * pError) { int r; diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h index 607f58cf..d410fdcf 100644 --- a/src/core/nntp/MCNNTPSession.h +++ b/src/core/nntp/MCNNTPSession.h @@ -45,7 +45,7 @@ namespace mailcore { virtual void checkAccount(ErrorCode * pError); virtual Array * /* NNTPGroupInfo */ listAllNewsgroups(ErrorCode * pError); - virtual Array * listDefaultNewsgroups(ErrorCode * pError); + virtual Array * /* NNTPGroupInfo */ listDefaultNewsgroups(ErrorCode * pError); virtual MessageHeader * fetchHeader(String * groupName, unsigned int index, ErrorCode * pError); virtual Array /*MessageHeader*/ * fetchOverArticlesInRange(Range range, String * groupname, ErrorCode * pError); @@ -55,7 +55,7 @@ namespace mailcore { virtual Data * fetchArticle(String *groupName, unsigned int index, NNTPProgressCallback * callback, ErrorCode * pError); virtual Data * fetchArticleByMessageID(String * groupname, String * messageID, ErrorCode * pError); - virtual time_t fetchServerClockTime(ErrorCode * pError); + virtual time_t fetchServerDate(ErrorCode * pError); virtual void setConnectionLogger(ConnectionLogger * logger); virtual ConnectionLogger * connectionLogger(); diff --git a/src/objc/nntp/MCONNTPSession.h b/src/objc/nntp/MCONNTPSession.h index 63e7467b..566756a1 100644 --- a/src/objc/nntp/MCONNTPSession.h +++ b/src/objc/nntp/MCONNTPSession.h @@ -71,7 +71,7 @@ /** Returns an operation that will fetch the list of article numbers. - MCONNTPFetchArticlesOperation * op = [session fetchAllArticlesOperation]; + MCONNTPFetchArticlesOperation * op = [session fetchAllArticlesOperation:@"comp.lang.c"]; [op start:^(NSError * error, MCOIndexSet * articles) { }]; */ @@ -80,7 +80,7 @@ /** Returns an operation that will fetch the header of the given message. - MCONNTPFetchHeaderOperation * op = [session fetchHeaderOperationWithIndex:idx inGroup:@"Group"]; + MCONNTPFetchHeaderOperation * op = [session fetchHeaderOperationWithIndex:idx inGroup:@"comp.lang.c"]; [op start:^(NSError * error, MCOMessageHeader * header) { // header is the parsed header of the message. }]; @@ -90,7 +90,7 @@ /** Returns an operation that will fetch an overview (headers) for a set of messages. - MCONNTPFetchHeaderOperation * op = [session fetchOverviewOperationWithIndexes:indexes inGroup:@"Group"]; + MCONNTPFetchHeaderOperation * op = [session fetchOverviewOperationWithIndexes:indexes inGroup:@"comp.lang.c"]; [op start:^(NSError * error, NSArray * headers) { // headers are the parsed headers of each part of the overview. }]; @@ -100,7 +100,7 @@ /** Returns an operation that will fetch the content of the given message. - MCONNTPFetchArticleOperation * op = [session fetchArticleOperationWithIndex:idx inGroup:@"Group"]; + MCONNTPFetchArticleOperation * op = [session fetchArticleOperationWithIndex:idx inGroup:@"comp.lang.c"]; [op start:^(NSError * error, NSData * messageData) { // messageData is the RFC 822 formatted message data. }]; @@ -110,7 +110,7 @@ /** Returns an operation that will fetch the content of a message with the given messageID. - MCONNTPFetchArticleOperation * op = [session fetchArticleOperationWithMessageID:@"<26>" inGroup:@"Group"]; + MCONNTPFetchArticleOperation * op = [session fetchArticleOperationWithMessageID:@"<MessageID123@mail.google.com>" inGroup:@"comp.lang.c"]; [op start:^(NSError * error, NSData * messageData) { // messageData is the RFC 822 formatted message data. }]; @@ -120,11 +120,11 @@ /** Returns an operation that will fetch the server's date and time. - MCONNTPFetchArticleOperation * op = [session fetchServerTimeOperation]; - [op start:^(NSError * error, NSDate * serverTime) { + MCONNTPFetchArticleOperation * op = [session fetchServerDateOperation]; + [op start:^(NSError * error, NSDate * serverDate) { }]; */ -- (MCONNTPFetchServerTimeOperation *) fetchServerTimeOperation; +- (MCONNTPFetchServerTimeOperation *) fetchServerDateOperation; /** Returns an operation that will list all available newsgroups. diff --git a/src/objc/nntp/MCONNTPSession.mm b/src/objc/nntp/MCONNTPSession.mm index b9d3573c..10011e6e 100644 --- a/src/objc/nntp/MCONNTPSession.mm +++ b/src/objc/nntp/MCONNTPSession.mm @@ -150,8 +150,8 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue, return MCO_TO_OBJC_OP(coreOp); } -- (MCONNTPFetchServerTimeOperation *) fetchServerTimeOperation { - mailcore::NNTPFetchServerTimeOperation * coreOp = MCO_NATIVE_INSTANCE->fetchServerTimeOperation(); +- (MCONNTPFetchServerTimeOperation *) fetchServerDateOperation { + mailcore::NNTPFetchServerTimeOperation * coreOp = MCO_NATIVE_INSTANCE->fetchServerDateOperation(); return MCO_TO_OBJC_OP(coreOp); } |