mirror of
https://github.com/TrianguloY/UrlChecker.git
synced 2024-09-19 20:02:16 +02:00
parent
de76b2a271
commit
5a942f0eaa
@ -66,13 +66,13 @@ public class MainDialog extends Activity {
|
||||
/**
|
||||
* Something wants to set a new url.
|
||||
*/
|
||||
public void onNewUrl(UrlData urlData) {
|
||||
public void onNewUrl(UrlData newUrlData) {
|
||||
// mark as next if nothing else yet
|
||||
if (updating != 0) {
|
||||
AndroidUtils.assertError("Don't call onNewUrl while updating, use the onModifyUrl return value");
|
||||
return;
|
||||
}
|
||||
this.urlData = urlData;
|
||||
urlData = newUrlData;
|
||||
|
||||
// fire updates loop
|
||||
main_loop:
|
||||
@ -99,11 +99,11 @@ public class MainDialog extends Activity {
|
||||
// skip own if required
|
||||
if (!urlData.triggerOwn && module == urlData.trigger) continue;
|
||||
try {
|
||||
var newUrlData = module.onModifyUrl(urlData);
|
||||
if (newUrlData != null) {
|
||||
var modifiedUrlData = module.onModifyUrl(urlData);
|
||||
if (modifiedUrlData != null) {
|
||||
// modified, restart
|
||||
newUrlData.mergeData(urlData);
|
||||
urlData = newUrlData;
|
||||
modifiedUrlData.mergeData(urlData);
|
||||
urlData = modifiedUrlData;
|
||||
continue main_loop;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
@ -164,7 +164,7 @@ class OpenDialog extends AModuleDialog {
|
||||
|
||||
@Override
|
||||
public void onDisplayUrl(UrlData urlData) {
|
||||
updateSpinner();
|
||||
updateSpinner(urlData.url);
|
||||
}
|
||||
|
||||
// ------------------- Spinner -------------------
|
||||
@ -172,8 +172,8 @@ class OpenDialog extends AModuleDialog {
|
||||
/**
|
||||
* Populates the spinner with the apps that can open it, in preference order
|
||||
*/
|
||||
private void updateSpinner() {
|
||||
packages = PackageUtils.getOtherPackages(UrlUtils.getViewIntent(getUrl(), null), getActivity());
|
||||
private void updateSpinner(String url) {
|
||||
packages = PackageUtils.getOtherPackages(UrlUtils.getViewIntent(url, null), getActivity());
|
||||
|
||||
// remove referrer
|
||||
if (noReferrerPref.get()) {
|
||||
|
Loading…
Reference in New Issue
Block a user