Skip to content

Commit

Permalink
OMA-646: Fixed ios request error handling. capacitor-community#224
Browse files Browse the repository at this point in the history
  • Loading branch information
mrahn24 committed Jan 27, 2022
1 parent de997a1 commit d500cdd
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 5 deletions.
Binary file modified .DS_Store
Binary file not shown.
201 changes: 201 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
.DS_Store

# ==============
# Android ignore
# ==============

# Built application files
*.apk
*.aar
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
android/.idea/workspace.xml
android/.idea/tasks.xml
android/.idea/gradle.xml
android/.idea/assetWizardSettings.xml
android/.idea/dictionaries
android/.idea/libraries
android/.idea/jarRepositories.xml
# Android Studio 3 in .gitignore file.
android/.idea/caches
android/.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
android/.idea/navEditor.xml

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

# Android Profiling
*.hprof

# ==========
# iOS ignore
# ==========
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build/

# Accio dependency management
Dependencies/
.accio/

# fastlane
#
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

# ==========
# Web ignore
# ==========
node_modules
dist

# ==============
# Example ignore
# ==============
example/ios/App/App/public
example/ios/capacitor-cordova-ios-plugins
Binary file modified android/.DS_Store
Binary file not shown.
Binary file modified ios/.DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions ios/Plugin/HttpRequestHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ class HttpRequestHandler {
let task = urlSession.dataTask(with: urlRequest) { (data, response, error) in
urlSession.invalidateAndCancel();
if error != nil {
CAPLog.print("Error on request", String(describing: data), String(describing: response), String(describing: error))
call.reject("Error", "REQUEST", error, [:])
return
}

Expand Down
10 changes: 5 additions & 5 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Capacitor (3.0.0):
- Capacitor (3.3.4):
- CapacitorCordova
- CapacitorCordova (3.0.0)
- CapacitorCordova (3.3.4)

DEPENDENCIES:
- "Capacitor (from `../node_modules/@capacitor/ios`)"
Expand All @@ -14,9 +14,9 @@ EXTERNAL SOURCES:
:path: "../node_modules/@capacitor/ios"

SPEC CHECKSUMS:
Capacitor: 06cd8cd01340f5b162e9528bf5569d87a6f29009
CapacitorCordova: 183c8d1af3851da6d7a371f273462c8e64e15464
Capacitor: beae76c4df77918d67246d4388477b2ed6c208f3
CapacitorCordova: be63a87c35c92223becd38cb500c9007dbd49496

PODFILE CHECKSUM: b7b76f9a39066f9f3276fd95a6e5ca9625f20b3f

COCOAPODS: 1.11.0
COCOAPODS: 1.11.2

0 comments on commit d500cdd

Please sign in to comment.