Skip to content

Commit 8e71775

Browse files
aerychaerych
committed
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-iOS into issues/15266-fix-preview-url
2 parents c53fdc8 + e6040a2 commit 8e71775

165 files changed

Lines changed: 3837 additions & 1964 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/cache-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# To invalidate the cache, generate a new UUID using `uuidgen` on the command line then paste it here
2-
CA581BB8-E184-4E45-B582-C6BBF29260C8
2+
51EDC125-CD8E-4BBC-A03C-8E34385968BA

‎Podfile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ workspace 'WordPress.xcworkspace'
1616
## ===================================
1717
##
1818
def wordpress_shared
19-
pod 'WordPressShared', '~> 1.13.0-beta.1'
19+
pod 'WordPressShared', '~> 1.13.0'
2020
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
2121
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
2222
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit => ''
@@ -35,15 +35,15 @@ def aztec
3535
end
3636

3737
def wordpress_ui
38-
pod 'WordPressUI', '~> 1.7.3-beta.1'
38+
pod 'WordPressUI', '~> 1.7.4-beta.1'
3939
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :tag => ''
4040
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => ''
4141
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :commit => ''
4242
#pod 'WordPressUI', :path => '../WordPressUI-iOS'
4343
end
4444

4545
def wordpress_kit
46-
pod 'WordPressKit', '~> 4.21.0-beta.3'
46+
pod 'WordPressKit', '~> 4.21.0'
4747
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
4848
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
4949
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
@@ -70,7 +70,7 @@ def shared_test_pods
7070
end
7171

7272
def shared_with_extension_pods
73-
pod 'Gridicons', '~> 1.0.2-beta.1'
73+
pod 'Gridicons', '~> 1.0.2'
7474
pod 'ZIPFoundation', '~> 0.9.8'
7575
pod 'Down', '~> 0.6.6'
7676
end
@@ -154,7 +154,7 @@ target 'WordPress' do
154154
## Gutenberg (React Native)
155155
## =====================
156156
##
157-
gutenberg :tag => 'v1.41.1'
157+
gutenberg :tag => 'v1.42.0-alpha2'
158158

159159
## Third party libraries
160160
## =====================
@@ -196,9 +196,9 @@ target 'WordPress' do
196196
# pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''
197197
# pod 'WPMediaPicker', :path => '../MediaPicker-iOS'
198198

199-
pod 'Gridicons', '~> 1.0.2-beta.1'
199+
pod 'Gridicons', '~> 1.0.2'
200200

201-
pod 'WordPressAuthenticator', '~> 1.29.0-beta'
201+
pod 'WordPressAuthenticator', '~> 1.29.0'
202202
# While in PR
203203
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
204204
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
@@ -397,7 +397,6 @@ target 'WordPressScreenshotGeneration' do
397397
project 'WordPress/WordPress.xcodeproj'
398398

399399
wordpress_mocks
400-
pod 'SimulatorStatusMagic'
401400
end
402401

403402
## UI Tests

‎Podfile.lock‎

Lines changed: 98 additions & 102 deletions
Large diffs are not rendered by default.

‎RELEASE-NOTES.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
16.3
2+
-----
3+
* [*] Fixed an issue where `tel:` and `mailto:` links weren't launching actions in the webview found in Reader > post > more > Visit. [#15310]
4+
* [*] Reader bug fix: tapping a telephone, sms or email link in a detail post in Reader will now respond with the correct action. [#15307]
5+
6+
17
16.2
28
-----
39
* [**] Support contact email: fixed issue that prevented non-alpha characters from being entered. [#15210]
410
* [*] Support contact information prompt: fixed issue that could cause the app to crash when entering email address. [#15210]
511
* [*] Fixed an issue where comments viewed in the Reader would always be italicized.
12+
* [**] Jetpack Section - Added quick and easy access for all the Jetpack features (Stats, Activity Log, Jetpack and Settings) [#15287].
613

714
16.1
815
-----

‎Scripts/fastlane/Deliverfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ screenshots_path "./screenshots/"
55
app_identifier "org.wordpress"
66

77
# Make sure to update these keys for a new version
8-
app_version "16.1"
8+
app_version "16.2"
99

1010
privacy_url({
1111
'default' => 'https://automattic.com/privacy/',

‎Scripts/fastlane/Fastfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ import "./ScreenshotFastfile"
137137
"app_store_screenshot-5" => File.join(source_metadata_folder, "promo_screenshot_5.txt"),
138138
"app_store_screenshot-6" => File.join(source_metadata_folder, "promo_screenshot_6.txt"),
139139
"app_store_screenshot-7" => File.join(source_metadata_folder, "promo_screenshot_7.txt"),
140-
"app_store_screenshot-8" => File.join(source_metadata_folder, "promo_screenshot_8.txt"),
141140
}
142141

143142
ios_update_metadata_source(po_file_path: prj_folder + "/WordPress/Resources/AppStoreStrings.po",

‎Scripts/fastlane/download_metadata.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import Foundation
44

55
let glotPressSubtitleKey = "app_store_subtitle"
6-
let glotPressWhatsNewKey = "v16.1-whats-new"
6+
let glotPressWhatsNewKey = "v16.2-whats-new"
77
let glotPressDescriptionKey = "app_store_desc"
88
let glotPressKeywordsKey = "app_store_keywords"
99
let baseFolder = "./metadata"

‎WordPress/Classes/Extensions/URL+Helpers.swift‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,25 @@ extension URL {
147147
}
148148

149149

150+
/// Handle the common link protocols.
151+
/// - tel: open a prompt to call the phone number
152+
/// - sms: compose new message in iMessage app
153+
/// - mailto: compose new email in Mail app
154+
///
155+
var isLinkProtocol: Bool {
156+
guard let urlScheme = scheme else {
157+
return false
158+
}
159+
160+
let linkProtocols = ["tel", "sms", "mailto"]
161+
if linkProtocols.contains(urlScheme) && UIApplication.shared.canOpenURL(self) {
162+
return true
163+
}
164+
165+
return false
166+
}
167+
168+
150169
/// Does a quick test to see if 2 urls are equal to each other by
151170
/// using just the hosts and paths. This ignores any query items, or hashes
152171
/// on the urls

‎WordPress/Classes/Services/MediaService.m‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,16 @@ - (void)syncMediaLibraryForBlog:(Blog *)blog
577577
{
578578
__block BOOL onePageLoad = NO;
579579
NSManagedObjectID *blogObjectID = [blog objectID];
580+
581+
/// Temporary logging to try and narrow down an issue:
582+
///
583+
/// REF: https://github.com/wordpress-mobile/WordPress-iOS/issues/15335
584+
///
585+
if (blog == nil || blog.objectID == nil) {
586+
DDLogError(@"🔴 Error: missing object ID (please contact @diegoreymendez with this log)");
587+
DDLogError(@"%@", [NSThread callStackSymbols]);
588+
}
589+
580590
[self.managedObjectContext performBlock:^{
581591
NSError *error = nil;
582592
Blog *blogInContext = (Blog *)[self.managedObjectContext existingObjectWithID:blogObjectID error:&error];

‎WordPress/Classes/Services/PostCoordinator.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,10 @@ class PostCoordinator: NSObject {
304304
var gutenbergProcessors = [Processor]()
305305
var aztecProcessors = [Processor]()
306306

307+
// File block can upload any kind of media.
308+
let gutenbergFileProcessor = GutenbergFileUploadProcessor(mediaUploadID: gutenbergMediaUploadID, serverMediaID: mediaID, remoteURLString: remoteURLStr)
309+
gutenbergProcessors.append(gutenbergFileProcessor)
310+
307311
if media.mediaType == .image {
308312
let gutenbergImgPostUploadProcessor = GutenbergImgUploadProcessor(mediaUploadID: gutenbergMediaUploadID, serverMediaID: mediaID, remoteURLString: remoteURLStr)
309313
gutenbergProcessors.append(gutenbergImgPostUploadProcessor)

0 commit comments

Comments
 (0)