From c52c6c6248e560a7aed11c428c9a54dbd3a72f94 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Thu, 14 Aug 2014 00:45:59 +0200 Subject: [PATCH] Clearing notifications from notification center Application acknowledges notifications and then clears them from notification center. //FREEBIE --- Signal.xcodeproj/project.pbxproj | 27 +-------- .../contents.xcworkspacedata | 7 +++ .../xcshareddata/Signal.xccheckout | 53 ++++++++++++++++++ .../xcshareddata/xcschemes/Signal.xcscheme | 2 +- .../xcshareddata/Signal.xccheckout | 53 ++++++++++++++++++ Signal/src/AppDelegate.m | 6 +- .../zh_TW.Big5.lproj/Localizable.strings | Bin 15408 -> 0 bytes 7 files changed, 122 insertions(+), 26 deletions(-) create mode 100644 Signal.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout create mode 100644 Signal.xcworkspace/xcshareddata/Signal.xccheckout delete mode 100644 Signal/translations/zh_TW.Big5.lproj/Localizable.strings diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index acece35de..63b9366f7 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -415,7 +415,6 @@ B6416FD0199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416F9F199A0478003C5699 /* Localizable.strings */; }; B6416FD1199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FA2199A0478003C5699 /* Localizable.strings */; }; B6416FD2199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FA5199A0478003C5699 /* Localizable.strings */; }; - B6416FD3199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FA8199A0478003C5699 /* Localizable.strings */; }; B6416FD4199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FAB199A0478003C5699 /* Localizable.strings */; }; B67ADDC41989FF8700E1A773 /* CallServerRequestsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B67ADDC31989FF8700E1A773 /* CallServerRequestsManager.m */; }; B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B67EBF5C19194AC60084CCFD /* Settings.bundle */; }; @@ -1148,7 +1147,6 @@ B6416FA0199A0478003C5699 /* tr_TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr_TR; path = Localizable.strings; sourceTree = ""; }; B6416FA3199A0478003C5699 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = Localizable.strings; sourceTree = ""; }; B6416FA6199A0478003C5699 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = Localizable.strings; sourceTree = ""; }; - B6416FA9199A0478003C5699 /* zh_TW.Big5 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW.Big5; path = Localizable.strings; sourceTree = ""; }; B6416FAC199A0478003C5699 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = Localizable.strings; sourceTree = ""; }; B657DDC91911A40500F45B0C /* Signal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Signal.entitlements; sourceTree = ""; }; B661C211198EE2EA00548CA1 /* iOSVersions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iOSVersions.h; path = src/environment/iOSVersions.h; sourceTree = ""; }; @@ -2810,15 +2808,6 @@ path = translations/zh_CN.lproj; sourceTree = ""; }; - B6416FA7199A0478003C5699 /* zh_TW.Big5.lproj */ = { - isa = PBXGroup; - children = ( - B6416FA8199A0478003C5699 /* Localizable.strings */, - ); - name = zh_TW.Big5.lproj; - path = translations/zh_TW.Big5.lproj; - sourceTree = ""; - }; B6416FAA199A0478003C5699 /* zh_TW.lproj */ = { isa = PBXGroup; children = ( @@ -2869,7 +2858,6 @@ B6416F9E199A0478003C5699 /* tr_TR.lproj */, B6416FA1199A0478003C5699 /* uk.lproj */, B6416FA4199A0478003C5699 /* zh_CN.lproj */, - B6416FA7199A0478003C5699 /* zh_TW.Big5.lproj */, B6416FAA199A0478003C5699 /* zh_TW.lproj */, ); name = Translations; @@ -3350,7 +3338,6 @@ E14874EA18A06930002CC4F3 /* tab_icon_inbox@2x.png in Resources */, E14874EB18A06930002CC4F3 /* tab_icon_keypad.png in Resources */, E14874EC18A06930002CC4F3 /* tab_icon_keypad@2x.png in Resources */, - B6416FD3199A0478003C5699 /* Localizable.strings in Resources */, E14874ED18A06930002CC4F3 /* tab_icon_menu.png in Resources */, B6416FCD199A0478003C5699 /* Localizable.strings in Resources */, E14874EE18A06930002CC4F3 /* tab_icon_menu@2x.png in Resources */, @@ -4242,14 +4229,6 @@ name = Localizable.strings; sourceTree = ""; }; - B6416FA8199A0478003C5699 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - B6416FA9199A0478003C5699 /* zh_TW.Big5 */, - ); - name = Localizable.strings; - sourceTree = ""; - }; B6416FAB199A0478003C5699 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( @@ -4375,7 +4354,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = Signal; - PROVISIONING_PROFILE = "A4026C2D-D5F0-40C5-B1B4-5EA8E8A1876B"; + PROVISIONING_PROFILE = "036480DA-A21D-4CC6-BF48-98E8AE1EE981"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; TEST_AFTER_BUILD = YES; @@ -4495,7 +4474,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-fobjc-arc-exceptions"; PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "A4026C2D-D5F0-40C5-B1B4-5EA8E8A1876B"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -4662,7 +4641,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = Signal; - PROVISIONING_PROFILE = "A4026C2D-D5F0-40C5-B1B4-5EA8E8A1876B"; + PROVISIONING_PROFILE = "7214A823-1F7A-4460-82D8-D89CA511CEA6"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; TEST_AFTER_BUILD = YES; diff --git a/Signal.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Signal.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..215d8664f --- /dev/null +++ b/Signal.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout b/Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout new file mode 100644 index 000000000..7bd48f1a5 --- /dev/null +++ b/Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 3A3A9222-5BC1-48E7-8601-0FB31BE919FB + IDESourceControlProjectName + Signal + IDESourceControlProjectOriginsDictionary + + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + github.com:WhisperSystems/Signal-iOS.git + D74FB800F048CB516BB4BC70047F7CC676D291B9 + https://github.com/FredericJacobs/Precompiled-Signal-Dependencies.git + + IDESourceControlProjectPath + Signal.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + ../.. + D74FB800F048CB516BB4BC70047F7CC676D291B9 + ../..Pods/ + + IDESourceControlProjectURL + github.com:WhisperSystems/Signal-iOS.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + D74FB800F048CB516BB4BC70047F7CC676D291B9 + IDESourceControlWCCName + Pods + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + IDESourceControlWCCName + Signal-iOS + + + + diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 4b42305e8..81ff23451 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -54,7 +54,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" + buildConfiguration = "Ad-Hoc Distribution" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> diff --git a/Signal.xcworkspace/xcshareddata/Signal.xccheckout b/Signal.xcworkspace/xcshareddata/Signal.xccheckout new file mode 100644 index 000000000..3559b0543 --- /dev/null +++ b/Signal.xcworkspace/xcshareddata/Signal.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 90A05A58-76B3-4EF9-A59F-88109694A394 + IDESourceControlProjectName + Signal + IDESourceControlProjectOriginsDictionary + + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + github.com:WhisperSystems/Signal-iOS.git + D74FB800F048CB516BB4BC70047F7CC676D291B9 + https://github.com/FredericJacobs/Precompiled-Signal-Dependencies.git + + IDESourceControlProjectPath + Signal.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + .. + D74FB800F048CB516BB4BC70047F7CC676D291B9 + ..Pods/ + + IDESourceControlProjectURL + github.com:WhisperSystems/Signal-iOS.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + D74FB800F048CB516BB4BC70047F7CC676D291B9 + IDESourceControlWCCName + Pods + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C + IDESourceControlWCCName + Signal-iOS + + + + diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 7d8f43be8..b0f92be1e 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -187,7 +187,11 @@ -(void) applicationDidBecomeActive:(UIApplication *)application { [[AppAudioManager sharedInstance] awake]; - application.applicationIconBadgeNumber = 0; + + // Hacky way to clear notification center after processed push + [[UIApplication sharedApplication] setApplicationIconBadgeNumber:1]; + [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0]; + [self removeScreenProtection]; if ([Environment isRegistered]) { diff --git a/Signal/translations/zh_TW.Big5.lproj/Localizable.strings b/Signal/translations/zh_TW.Big5.lproj/Localizable.strings deleted file mode 100644 index 896593f04274a24d3103a2bb2348f26a921d652c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15408 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