Skip to content

Commit e08fb78

Browse files
committed
Bug 1499453 - Use GeckoResult.ALLOW/DENY shortcuts in GeckoView code r=android-reviewers,owlish,tchoh
Differential Revision: https://phabricator.services.mozilla.com/D208415
1 parent e9b9a54 commit e08fb78

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1158,9 +1158,9 @@ class GeckoEngineSession(
11581158

11591159
return when {
11601160
maybeInterceptRequest(request, false) != null ->
1161-
GeckoResult.fromValue(AllowOrDeny.DENY)
1161+
GeckoResult.deny()
11621162
request.target == NavigationDelegate.TARGET_WINDOW_NEW ->
1163-
GeckoResult.fromValue(AllowOrDeny.ALLOW)
1163+
GeckoResult.allow()
11641164
else -> {
11651165
notifyObservers {
11661166
onLoadRequest(
@@ -1170,7 +1170,7 @@ class GeckoEngineSession(
11701170
)
11711171
}
11721172

1173-
GeckoResult.fromValue(AllowOrDeny.ALLOW)
1173+
GeckoResult.allow()
11741174
}
11751175
}
11761176
}
@@ -1180,15 +1180,15 @@ class GeckoEngineSession(
11801180
request: NavigationDelegate.LoadRequest,
11811181
): GeckoResult<AllowOrDeny> {
11821182
if (request.target == NavigationDelegate.TARGET_WINDOW_NEW) {
1183-
return GeckoResult.fromValue(AllowOrDeny.ALLOW)
1183+
return GeckoResult.allow()
11841184
}
11851185

11861186
return if (maybeInterceptRequest(request, true) != null) {
1187-
GeckoResult.fromValue(AllowOrDeny.DENY)
1187+
GeckoResult.deny()
11881188
} else {
11891189
// Not notifying session observer because of performance concern and currently there
11901190
// is no use case.
1191-
GeckoResult.fromValue(AllowOrDeny.ALLOW)
1191+
GeckoResult.allow()
11921192
}
11931193
}
11941194

mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4361,7 +4361,7 @@ class GeckoEngineSessionTest {
43614361
mockLoadRequest("sample:about", triggeredByRedirect = true),
43624362
)
43634363

4364-
assertEquals(geckoResult!!, GeckoResult.fromValue(AllowOrDeny.ALLOW))
4364+
assertEquals(geckoResult!!, GeckoResult.allow())
43654365
}
43664366

43674367
@Test

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ void newTab(final Message message, final WebExtension extension) {
15491549
if (delegate != null) {
15501550
result = delegate.onCloseTab(extension, message.session);
15511551
} else {
1552-
result = GeckoResult.fromValue(AllowOrDeny.DENY);
1552+
result = GeckoResult.deny();
15531553
}
15541554

15551555
message.callback.resolveTo(

mobile/android/test_runner/src/main/java/org/mozilla/geckoview/test_runner/TestRunnerActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void onLocationChange(
174174
public GeckoResult<AllowOrDeny> onLoadRequest(
175175
final GeckoSession session, final LoadRequest request) {
176176
// Allow Gecko to load all URIs
177-
return GeckoResult.fromValue(AllowOrDeny.ALLOW);
177+
return GeckoResult.allow();
178178
}
179179

180180
@Override
@@ -296,7 +296,7 @@ public void onPageAction(
296296
public GeckoResult<AllowOrDeny> onCloseTab(
297297
@Nullable final WebExtension source, @NonNull final GeckoSession session) {
298298
closeSession(session);
299-
return GeckoResult.fromValue(AllowOrDeny.ALLOW);
299+
return GeckoResult.allow();
300300
}
301301

302302
@Override
@@ -310,7 +310,7 @@ public GeckoResult<AllowOrDeny> onUpdateTab(
310310
mOwnedSessions.addFirst(session);
311311
}
312312

313-
return GeckoResult.fromValue(AllowOrDeny.ALLOW);
313+
return GeckoResult.allow();
314314
}
315315
};
316316

0 commit comments

Comments
 (0)