Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/http-warning] Warn of plain HTTP URLs during setup #328

Closed
wants to merge 1 commit into from
Closed

[feature/http-warning] Warn of plain HTTP URLs during setup #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios-sdk
Open in desktop
Submodule ios-sdk updated 14 files
+2 −0 ownCloudSDK/Bookmark/OCBookmark.h
+2 −0 ownCloudSDK/Bookmark/OCBookmark.m
+48 −0 ownCloudSDK/Connection/OCConnection+Setup.m
+11 −0 ownCloudSDK/Connection/OCConnection.h
+63 −5 ownCloudSDK/Connection/OCConnection.m
+1 −0 ownCloudSDK/HTTP/Status/OCHTTPStatus.h
+5 −0 ownCloudSDK/HTTP/Status/OCHTTPStatus.m
+3 −0 ownCloudSDK/Issues/OCIssue.h
+26 −0 ownCloudSDK/Issues/OCIssue.m
+7 −0 ownCloudSDK/Resources/en.lproj/Localizable.strings
+7 −5 ownCloudSDKTests/ConnectionTests.m
+6 −6 ownCloudSDKTests/CoreSharingTests.m
+4 −2 ownCloudSDKTests/HostSimulatorTests.m
+1 −1 ownCloudSDKTests/SharingTests.m
6 changes: 3 additions & 3 deletions ownCloud/Bookmarks/BookmarkViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ class BookmarkViewController: StaticTableViewController {
func isAuthenticationMethodTokenBased(_ authenticationMethodIdentifier: OCAuthenticationMethodIdentifier) -> Bool {
return authenticationMethodTypeForIdentifier(authenticationMethodIdentifier) == OCAuthenticationMethodType.token
}

// MARK: - Keyboard AccessoryView
@objc func toogleTextField (_ sender: UIBarButtonItem) {
if passwordRow?.textField?.isFirstResponder ?? false {
Expand Down Expand Up @@ -789,7 +789,7 @@ extension BookmarkViewController : OCClassSettingsSupport {

// MARK: - Keyboard / return key tracking
extension BookmarkViewController : UITextFieldDelegate {

func textFieldShouldReturn(_ textField: UITextField) -> Bool {
if self.navigationItem.rightBarButtonItem == continueBarButtonItem {
if !updateInputFocus() {
Expand All @@ -801,7 +801,7 @@ extension BookmarkViewController : UITextFieldDelegate {

return true
}

func textFieldDidBeginEditing(_ textField: UITextField) {
activeTextField = textField
if textField.isEqual(urlRow?.textField) {
Expand Down
2 changes: 1 addition & 1 deletion ownCloud/Client/ClientQueryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ class ClientQueryViewController: UITableViewController, Themeable {
let filename = ressource.originalFilename

let progress = Progress(totalUnitCount: 100)
progress.localizedDescription = String(format: "Importing '%@' from photo library".localized , filename)
progress.localizedDescription = String(format: "Importing '%@' from photo library".localized, filename)

let options = PHAssetResourceRequestOptions()
options.isNetworkAccessAllowed = true
Expand Down
2 changes: 1 addition & 1 deletion ownCloud/Client/PhotoSelectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class PhotoSelectionViewCell: UICollectionViewCell {
var mediaTypeBadgeImageView = UIImageView()
var checkmarkBadgeImageView = UIImageView()
var videoDurationLabel = UILabel()

var assetIdentifier: String!

var thumbnailImage: UIImage! {
Expand Down
2 changes: 1 addition & 1 deletion ownCloud/SDK Extensions/OCIssue+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ extension OCIssue {
}
}

case .urlRedirection, .certificate, .error, .multipleChoice:
case .urlRedirection, .certificate, .error, .generic, .multipleChoice:
displayIssues = [self]
}

Expand Down