From 84e9c33f125d20a837b048d69fe1ab208ec15e46 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 19 Jul 2017 15:30:48 -0400 Subject: [PATCH 1/5] Optionally link Metal/MetalKit frameworks used by WebRTC // FREEBIE --- Signal.xcodeproj/project.pbxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 81d223bfd..624e3b520 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -136,6 +136,8 @@ 4542F0961EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4542F0951EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift */; }; 4542F0971EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4542F0951EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift */; }; 45464DBC1DFA041F001D3FD6 /* DataChannelMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45464DBB1DFA041F001D3FD6 /* DataChannelMessage.swift */; }; + 455A16DD1F1FEA0000F86704 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 455A16DB1F1FEA0000F86704 /* Metal.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 455A16DE1F1FEA0000F86704 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 455A16DC1F1FEA0000F86704 /* MetalKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 45666EC61D99483D008FE134 /* OWSAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */; }; 45666EC91D994C0D008FE134 /* OWSGroupAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC81D994C0D008FE134 /* OWSGroupAvatarBuilder.m */; }; 45666F561D9B2827008FE134 /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */; }; @@ -570,6 +572,8 @@ 4542F0951EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+retainUntilComplete.swift"; sourceTree = ""; }; 45464DBB1DFA041F001D3FD6 /* DataChannelMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataChannelMessage.swift; sourceTree = ""; }; 454B35071D08EED80026D658 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mk; path = translations/mk.lproj/Localizable.strings; sourceTree = ""; }; + 455A16DB1F1FEA0000F86704 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + 455A16DC1F1FEA0000F86704 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; }; 45666EC41D99483D008FE134 /* OWSAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAvatarBuilder.h; sourceTree = ""; }; 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAvatarBuilder.m; sourceTree = ""; }; 45666EC71D994C0D008FE134 /* OWSGroupAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSGroupAvatarBuilder.h; sourceTree = ""; }; @@ -846,6 +850,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 455A16DD1F1FEA0000F86704 /* Metal.framework in Frameworks */, + 455A16DE1F1FEA0000F86704 /* MetalKit.framework in Frameworks */, 45847E871E4283C30080EAB3 /* Intents.framework in Frameworks */, 4509E79A1DD653700025A59F /* WebRTC.framework in Frameworks */, 456C38961DC7B882007536A7 /* PromiseKit.framework in Frameworks */, @@ -1633,6 +1639,8 @@ D221A08C169C9E5E00537ABF /* Frameworks */ = { isa = PBXGroup; children = ( + 455A16DB1F1FEA0000F86704 /* Metal.framework */, + 455A16DC1F1FEA0000F86704 /* MetalKit.framework */, 45847E861E4283C30080EAB3 /* Intents.framework */, 45BD60811DE9547E00A8F436 /* Contacts.framework */, 4509E7991DD653700025A59F /* WebRTC.framework */, From 3cbab3fe349584192452a0ee1d0741dd6b2bf760 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 19 Jul 2017 15:53:31 -0400 Subject: [PATCH 2/5] bump build // FREEBIE --- Signal/Signal-Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index b3072f533..b4c2df68a 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -55,7 +55,7 @@ CFBundleVersion - 2.14.1.0 + 2.14.1.1 ITSAppUsesNonExemptEncryption LOGS_EMAIL From be731b7b2ad08de63ecef705b7da99e24ebae143 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 19 Jul 2017 15:55:08 -0400 Subject: [PATCH 3/5] sync translations // FREEBIE --- .../ja_JP.lproj/Localizable.strings | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Signal/translations/ja_JP.lproj/Localizable.strings b/Signal/translations/ja_JP.lproj/Localizable.strings index d6d3cd59d..6f94b19ed 100644 --- a/Signal/translations/ja_JP.lproj/Localizable.strings +++ b/Signal/translations/ja_JP.lproj/Localizable.strings @@ -56,13 +56,13 @@ "APN_MESSAGE_IN_GROUP_DETAILED" = "%@の%@：%@"; /* Message format for the 'new app version available' alert. Embeds: {{The latest app version number.}}. */ -"APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "Version %@ is now available in the App Store."; +"APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "バージョン%@がApp Storeに出ています"; /* Title for the 'new app version available' alert. */ -"APP_UPDATE_NAG_ALERT_TITLE" = "A New Version of Signal is Available"; +"APP_UPDATE_NAG_ALERT_TITLE" = "Signalの最新版が出ています"; /* Label for the 'update' button in the 'new app version available' alert. */ -"APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "Update"; +"APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "更新する"; /* Name of application */ "APPLICATION_NAME" = "Signal"; @@ -140,7 +140,7 @@ "ATTACHMENT_TYPE_VOICE_MESSAGE" = "音声メッセージ"; /* action sheet button title to enable built in speaker during a call */ -"AUDIO_ROUTE_BUILT_IN_SPEAKER" = "Speaker"; +"AUDIO_ROUTE_BUILT_IN_SPEAKER" = "スピーカー"; /* An explanation of the consequences of blocking another user. */ "BLOCK_BEHAVIOR_EXPLANATION" = "拒否すると通話もメッセージも受け付けません"; @@ -296,7 +296,7 @@ "CONVERSATION_SETTINGS" = "会話設定"; /* Label for 'new contact' button in conversation settings view. */ -"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Add to Existing Contact"; +"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "既存の連絡先に加える"; /* table cell label in conversation settings */ "CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "この人を拒否する"; @@ -335,7 +335,7 @@ "CONVERSATION_SETTINGS_MUTED_UNTIL_FORMAT" = "%@まで"; /* Label for 'new contact' button in conversation settings view. */ -"CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact"; +"CONVERSATION_SETTINGS_NEW_CONTACT" = "新規の連絡先を作る"; /* Label for button to unmute a thread. */ "CONVERSATION_SETTINGS_UNMUTE_ACTION" = "消音をやめる"; @@ -653,7 +653,7 @@ "IN_CALL_TERMINATED" = "通話が終了"; /* Label reminding the user that they are in archive mode. */ -"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "You are viewing your archived messages. Tap to return to your Inbox."; +"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "保管庫のメッセージを見ています。受信箱に戻るにはタップしてください。"; /* Multiline label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "連絡先の名前を見るには，連絡先へのアクセスが必要です。"; @@ -665,7 +665,7 @@ "INCOMING_CALL_FROM" = "%@ から着信"; /* info message recorded in conversation history when local user declined a call */ -"INCOMING_DECLINED_CALL" = "You declined a call"; +"INCOMING_DECLINED_CALL" = "着信を拒否しました"; /* No comment provided by engineer. */ "INCOMING_INCOMPLETE_CALL" = "不完全着信"; @@ -950,7 +950,7 @@ "OUTGOING_CALL" = "発信"; /* No comment provided by engineer. */ -"OUTGOING_INCOMPLETE_CALL" = "Unanswered outgoing call"; +"OUTGOING_INCOMPLETE_CALL" = "返答が無かった発信"; /* A display format for oversize text messages. */ "OVERSIZE_TEXT_DISPLAY_FORMAT" = "%@... [詳細はタップで]"; From 0b43b944878787401b2453d9e4b634810efe1dcd Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 19 Jul 2017 17:14:21 -0400 Subject: [PATCH 4/5] revert WebRTC to fix iOS8 crashes // FREEBIE --- Carthage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage b/Carthage index c9f5152a2..fc8eebb92 160000 --- a/Carthage +++ b/Carthage @@ -1 +1 @@ -Subproject commit c9f5152a2ed8516c3f23364105135c048f901553 +Subproject commit fc8eebb92367031f60ea337c897551cc54baa4b2 From 18ff0727633026bd00b403a9c645dc5da14be0a7 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 19 Jul 2017 17:15:01 -0400 Subject: [PATCH 5/5] bump build // FREEBIE --- Signal/Signal-Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index b4c2df68a..adf715729 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -55,7 +55,7 @@ CFBundleVersion - 2.14.1.1 + 2.14.1.2 ITSAppUsesNonExemptEncryption LOGS_EMAIL