Skip to content

Commit 9c4d9fd

Browse files
OS-pedrogustavobilroOS-pedrogustavobilro
authored
fix: Only show error page if main page fails (#53)
* fix: Only show error page if main page fails References: - https://outsystemsrd.atlassian.net/browse/RMET-4937 * chore(release): prepare for version 1.6.1 References: - https://outsystemsrd.atlassian.net/browse/RMET-4937 * chore: Add Gemfile.lock To fix CI error in matching bundler version with fastlane * chore: Add Gemfile.lock To fix CI error in matching bundler version with fastlane
1 parent 16ba84a commit 9c4d9fd

File tree

5 files changed

+246
-5
lines changed

5 files changed

+246
-5
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ lint/tmp/
8585
# lint/reports/
8686

8787
.DS_Store
88-
Gemfile.lock
8988

9089
scripts/tmp
9190

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.6.1]
8+
9+
### Fixes
10+
11+
- Do not show error when web page has a resource that is unresolvable [RMET-4937](https://outsystemsrd.atlassian.net/browse/RMET-4937)
12+
713
## [1.6.0]
814

915
### Features

‎Gemfile.lock‎

Lines changed: 234 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,234 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.8)
5+
abbrev (0.1.2)
6+
addressable (2.8.8)
7+
public_suffix (>= 2.0.2, < 8.0)
8+
artifactory (3.0.17)
9+
atomos (0.1.3)
10+
aws-eventstream (1.4.0)
11+
aws-partitions (1.1204.0)
12+
aws-sdk-core (3.241.3)
13+
aws-eventstream (~> 1, >= 1.3.0)
14+
aws-partitions (~> 1, >= 1.992.0)
15+
aws-sigv4 (~> 1.9)
16+
base64
17+
bigdecimal
18+
jmespath (~> 1, >= 1.6.1)
19+
logger
20+
aws-sdk-kms (1.120.0)
21+
aws-sdk-core (~> 3, >= 3.241.3)
22+
aws-sigv4 (~> 1.5)
23+
aws-sdk-s3 (1.211.0)
24+
aws-sdk-core (~> 3, >= 3.241.3)
25+
aws-sdk-kms (~> 1)
26+
aws-sigv4 (~> 1.5)
27+
aws-sigv4 (1.12.1)
28+
aws-eventstream (~> 1, >= 1.0.2)
29+
babosa (1.0.4)
30+
base64 (0.2.0)
31+
bigdecimal (4.0.1)
32+
claide (1.1.0)
33+
colored (1.2)
34+
colored2 (3.1.2)
35+
commander (4.6.0)
36+
highline (~> 2.0.0)
37+
csv (3.3.5)
38+
declarative (0.0.20)
39+
digest-crc (0.7.0)
40+
rake (>= 12.0.0, < 14.0.0)
41+
domain_name (0.6.20240107)
42+
dotenv (2.8.1)
43+
emoji_regex (3.2.3)
44+
excon (0.112.0)
45+
faraday (1.10.4)
46+
faraday-em_http (~> 1.0)
47+
faraday-em_synchrony (~> 1.0)
48+
faraday-excon (~> 1.1)
49+
faraday-httpclient (~> 1.0)
50+
faraday-multipart (~> 1.0)
51+
faraday-net_http (~> 1.0)
52+
faraday-net_http_persistent (~> 1.0)
53+
faraday-patron (~> 1.0)
54+
faraday-rack (~> 1.0)
55+
faraday-retry (~> 1.0)
56+
ruby2_keywords (>= 0.0.4)
57+
faraday-cookie_jar (0.0.8)
58+
faraday (>= 0.8.0)
59+
http-cookie (>= 1.0.0)
60+
faraday-em_http (1.0.0)
61+
faraday-em_synchrony (1.0.1)
62+
faraday-excon (1.1.0)
63+
faraday-httpclient (1.0.1)
64+
faraday-multipart (1.2.0)
65+
multipart-post (~> 2.0)
66+
faraday-net_http (1.0.2)
67+
faraday-net_http_persistent (1.2.0)
68+
faraday-patron (1.0.0)
69+
faraday-rack (1.0.0)
70+
faraday-retry (1.0.3)
71+
faraday_middleware (1.2.1)
72+
faraday (~> 1.0)
73+
fastimage (2.4.0)
74+
fastlane (2.230.0)
75+
CFPropertyList (>= 2.3, < 4.0.0)
76+
abbrev (~> 0.1.2)
77+
addressable (>= 2.8, < 3.0.0)
78+
artifactory (~> 3.0)
79+
aws-sdk-s3 (~> 1.0)
80+
babosa (>= 1.0.3, < 2.0.0)
81+
base64 (~> 0.2.0)
82+
bundler (>= 1.12.0, < 3.0.0)
83+
colored (~> 1.2)
84+
commander (~> 4.6)
85+
csv (~> 3.3)
86+
dotenv (>= 2.1.1, < 3.0.0)
87+
emoji_regex (>= 0.1, < 4.0)
88+
excon (>= 0.71.0, < 1.0.0)
89+
faraday (~> 1.0)
90+
faraday-cookie_jar (~> 0.0.6)
91+
faraday_middleware (~> 1.0)
92+
fastimage (>= 2.1.0, < 3.0.0)
93+
fastlane-sirp (>= 1.0.0)
94+
gh_inspector (>= 1.1.2, < 2.0.0)
95+
google-apis-androidpublisher_v3 (~> 0.3)
96+
google-apis-playcustomapp_v1 (~> 0.1)
97+
google-cloud-env (>= 1.6.0, < 2.0.0)
98+
google-cloud-storage (~> 1.31)
99+
highline (~> 2.0)
100+
http-cookie (~> 1.0.5)
101+
json (< 3.0.0)
102+
jwt (>= 2.1.0, < 3)
103+
logger (>= 1.6, < 2.0)
104+
mini_magick (>= 4.9.4, < 5.0.0)
105+
multipart-post (>= 2.0.0, < 3.0.0)
106+
mutex_m (~> 0.3.0)
107+
naturally (~> 2.2)
108+
nkf (~> 0.2.0)
109+
optparse (>= 0.1.1, < 1.0.0)
110+
plist (>= 3.1.0, < 4.0.0)
111+
rubyzip (>= 2.0.0, < 3.0.0)
112+
security (= 0.1.5)
113+
simctl (~> 1.6.3)
114+
terminal-notifier (>= 2.0.0, < 3.0.0)
115+
terminal-table (~> 3)
116+
tty-screen (>= 0.6.3, < 1.0.0)
117+
tty-spinner (>= 0.8.0, < 1.0.0)
118+
word_wrap (~> 1.0.0)
119+
xcodeproj (>= 1.13.0, < 2.0.0)
120+
xcpretty (~> 0.4.1)
121+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
122+
fastlane-sirp (1.0.0)
123+
sysrandom (~> 1.0)
124+
gh_inspector (1.1.3)
125+
google-apis-androidpublisher_v3 (0.54.0)
126+
google-apis-core (>= 0.11.0, < 2.a)
127+
google-apis-core (0.11.3)
128+
addressable (~> 2.5, >= 2.5.1)
129+
googleauth (>= 0.16.2, < 2.a)
130+
httpclient (>= 2.8.1, < 3.a)
131+
mini_mime (~> 1.0)
132+
representable (~> 3.0)
133+
retriable (>= 2.0, < 4.a)
134+
rexml
135+
google-apis-iamcredentials_v1 (0.17.0)
136+
google-apis-core (>= 0.11.0, < 2.a)
137+
google-apis-playcustomapp_v1 (0.13.0)
138+
google-apis-core (>= 0.11.0, < 2.a)
139+
google-apis-storage_v1 (0.31.0)
140+
google-apis-core (>= 0.11.0, < 2.a)
141+
google-cloud-core (1.8.0)
142+
google-cloud-env (>= 1.0, < 3.a)
143+
google-cloud-errors (~> 1.0)
144+
google-cloud-env (1.6.0)
145+
faraday (>= 0.17.3, < 3.0)
146+
google-cloud-errors (1.5.0)
147+
google-cloud-storage (1.47.0)
148+
addressable (~> 2.8)
149+
digest-crc (~> 0.4)
150+
google-apis-iamcredentials_v1 (~> 0.1)
151+
google-apis-storage_v1 (~> 0.31.0)
152+
google-cloud-core (~> 1.6)
153+
googleauth (>= 0.16.2, < 2.a)
154+
mini_mime (~> 1.0)
155+
googleauth (1.8.1)
156+
faraday (>= 0.17.3, < 3.a)
157+
jwt (>= 1.4, < 3.0)
158+
multi_json (~> 1.11)
159+
os (>= 0.9, < 2.0)
160+
signet (>= 0.16, < 2.a)
161+
highline (2.0.3)
162+
http-cookie (1.0.8)
163+
domain_name (~> 0.5)
164+
httpclient (2.9.0)
165+
mutex_m
166+
jmespath (1.6.2)
167+
json (2.18.0)
168+
jwt (2.10.2)
169+
base64
170+
logger (1.7.0)
171+
mini_magick (4.13.2)
172+
mini_mime (1.1.5)
173+
multi_json (1.19.1)
174+
multipart-post (2.4.1)
175+
mutex_m (0.3.0)
176+
nanaimo (0.4.0)
177+
naturally (2.3.0)
178+
nkf (0.2.0)
179+
optparse (0.8.1)
180+
os (1.1.4)
181+
plist (3.7.2)
182+
public_suffix (7.0.2)
183+
rake (13.3.1)
184+
representable (3.2.0)
185+
declarative (< 0.1.0)
186+
trailblazer-option (>= 0.1.1, < 0.2.0)
187+
uber (< 0.2.0)
188+
retriable (3.1.2)
189+
rexml (3.4.4)
190+
rouge (3.28.0)
191+
ruby2_keywords (0.0.5)
192+
rubyzip (2.4.1)
193+
security (0.1.5)
194+
signet (0.21.0)
195+
addressable (~> 2.8)
196+
faraday (>= 0.17.5, < 3.a)
197+
jwt (>= 1.5, < 4.0)
198+
multi_json (~> 1.10)
199+
simctl (1.6.10)
200+
CFPropertyList
201+
naturally
202+
sysrandom (1.0.5)
203+
terminal-notifier (2.0.0)
204+
terminal-table (3.0.2)
205+
unicode-display_width (>= 1.1.1, < 3)
206+
trailblazer-option (0.1.2)
207+
tty-cursor (0.7.1)
208+
tty-screen (0.8.2)
209+
tty-spinner (0.9.3)
210+
tty-cursor (~> 0.7)
211+
uber (0.1.0)
212+
unicode-display_width (2.6.0)
213+
word_wrap (1.0.0)
214+
xcodeproj (1.27.0)
215+
CFPropertyList (>= 2.3.3, < 4.0)
216+
atomos (~> 0.1.3)
217+
claide (>= 1.0.2, < 2.0)
218+
colored2 (~> 3.1)
219+
nanaimo (~> 0.4.0)
220+
rexml (>= 3.3.6, < 4.0)
221+
xcpretty (0.4.1)
222+
rouge (~> 3.28.0)
223+
xcpretty-travis-formatter (1.0.1)
224+
xcpretty (~> 0.2, >= 0.0.7)
225+
226+
PLATFORMS
227+
arm64-darwin-24
228+
ruby
229+
230+
DEPENDENCIES
231+
fastlane (>= 2.221.0)
232+
233+
BUNDLED WITH
234+
2.5.23

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>io.ionic.libs</groupId>
88
<artifactId>ioninappbrowser-android</artifactId>
9-
<version>1.6.0</version>
9+
<version>1.6.1</version>
1010
</project>

‎src/main/java/com.outsystems.plugins.inappbrowser/osinappbrowserlib/views/OSIABWebViewActivity.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,10 +493,12 @@ class OSIABWebViewActivity : AppCompatActivity() {
493493
// let all errors first be handled by the WebView default error handling mechanism
494494
super.onReceivedError(view, request, error)
495495

496-
// we only want to show the error screen for some errors (e.g. no internet)
497-
// e.g. we don't want to show it for an error where an image fails to load
496+
// We only want to show the error screen for some errors (e.g. no internet)
497+
// e.g. we don't want to show it for an error where an image fails to load.
498+
// Also, we only want to show the error screen for errors in loading the main page,
499+
// a webpage may have errors loading resources but the page itself may still load.
498500
error?.let {
499-
if (errorsToHandle.contains(it.errorCode)) {
501+
if (errorsToHandle.contains(it.errorCode) && request?.isForMainFrame == true) {
500502
hasLoadError = true
501503
showErrorScreen()
502504
}

0 commit comments

Comments
 (0)