aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-10-24 09:36:22 -0400
committerGitHub <noreply@github.com>2018-10-24 09:36:22 -0400
commit657173abd8331842c4c81a9ad0773d55523e824f (patch)
treea67e07ee8e73d0cd9e4ea987909adafc43fb81ff
parentb19f9d9c5b6360d1d05ac3b2b7b3b5d78b0bdfa9 (diff)
parente3a5568bcf381dc2a1be56d2b14e0097d0335654 (diff)
downloadservo-657173abd8331842c4c81a9ad0773d55523e824f.tar.gz
servo-657173abd8331842c4c81a9ad0773d55523e824f.zip
Auto merge of #22013 - ferjm:android.openurl.intent, r=paulrouget
Handle open URL intent on Android - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #21997 This makes it easier to use Servo as the default browser. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22013) <!-- Reviewable:end -->
-rw-r--r--support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
index 430bb39ec2e..04012ecd0e6 100644
--- a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
@@ -7,6 +7,7 @@ package org.mozilla.servo;
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.system.ErrnoException;
@@ -70,10 +71,14 @@ public class MainActivity extends Activity implements Servo.Client {
}
}
- String args = getIntent().getStringExtra("servoargs");
- String log = getIntent().getStringExtra("servolog");
+ Intent intent = getIntent();
+ String args = intent.getStringExtra("servoargs");
+ String log = intent.getStringExtra("servolog");
mServoView.setServoArgs(args, log);
+ if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+ mServoView.loadUri(intent.getData());
+ }
setupUrlField();
}