Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: fix url resolution (#32422)

Browse source 
* fix localhost

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* android: parse search bar field in rust

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* Update comment to reflect new function behavior

---------

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Gae24 2024-06-10 12:03:07 +02:00 • committed by GitHub
parent 6f414df867
commit e6ea4a9c29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

32
support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
View file

@ -17,7 +17,6 @@ import android.util.Log;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.webkit.URLUtil;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ProgressBar;
@ -79,7 +78,7 @@ public class MainActivity extends Activity implements Servo.Client {
mServoView.setServoArgs(args, log);
if (Intent.ACTION_VIEW.equals(intent.getAction())) {
mServoView.loadUri(intent.getData());
mServoView.loadUri(intent.getData().toString());
}
setupUrlField();
}
@ -102,8 +101,9 @@ public class MainActivity extends Activity implements Servo.Client {
return false;
});
mUrlField.setOnFocusChangeListener((v, hasFocus) -> {
if(v.getId() == R.id.urlfield && !hasFocus) {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (v.getId() == R.id.urlfield && !hasFocus) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
assert imm != null;
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
}
@ -113,41 +113,33 @@ public class MainActivity extends Activity implements Servo.Client {
private void loadUrlFromField() {
String text = mUrlField.getText().toString();
text = text.trim();
String uri;
if (text.contains(" ") || !text.contains(".")) {
uri = URLUtil.composeSearchUrl(text, "https://duckduckgo.com/html/?q=%s", "%s");
} else {
uri = URLUtil.guessUrl(text);
if (uri.startsWith("http://") && !text.startsWith("http://")) {
uri = uri.replaceFirst("http://", "https://");
}
}
mServoView.loadUri(Uri.parse(uri));
mServoView.loadUri(text);
}
// From activity_main.xml:
public void onReloadClicked(View v) {
mServoView.reload();
}
public void onBackClicked(View v) {
mServoView.goBack();
}
public void onForwardClicked(View v) {
mServoView.goForward();
}
public void onStopClicked(View v) {
mServoView.stop();
}
@Override
public void onAlert(String message) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(message);
AlertDialog alert = builder.create();
alert.show();
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(message);
AlertDialog alert = builder.create();
alert.show();
}
@Override

6
support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
View file

@ -211,11 +211,11 @@ public class ServoView extends SurfaceView
mServo.stop();
}
public void loadUri(Uri uri) {
public void loadUri(String uri) {
if (mServo != null) {
mServo.loadUri(uri.toString());
mServo.loadUri(uri);
} else {
mInitialUri = uri.toString();
mInitialUri = uri;
}
}