Browse Source

Fixed bugs with opening file:// urls in the browser via intent

master
Anthony Restaino 8 years ago
parent
commit
6e108dbbff
  1. 20
      app/src/main/java/acr/browser/lightning/activity/TabsManager.java
  2. 7
      app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.java

20
app/src/main/java/acr/browser/lightning/activity/TabsManager.java

@ -28,11 +28,13 @@ import acr.browser.lightning.constant.StartPage; @@ -28,11 +28,13 @@ import acr.browser.lightning.constant.StartPage;
import acr.browser.lightning.database.BookmarkManager;
import acr.browser.lightning.database.HistoryDatabase;
import acr.browser.lightning.preference.PreferenceManager;
import com.anthonycr.bonsai.Action;
import com.anthonycr.bonsai.Observable;
import com.anthonycr.bonsai.OnSubscribe;
import com.anthonycr.bonsai.Schedulers;
import com.anthonycr.bonsai.Subscriber;
import acr.browser.lightning.utils.FileUtils;
import acr.browser.lightning.utils.UrlUtils;
import acr.browser.lightning.view.LightningView;
@ -170,6 +172,16 @@ public class TabsManager { @@ -170,6 +172,16 @@ public class TabsManager {
builder.setCancelable(true)
.setTitle(R.string.title_warning)
.setMessage(R.string.message_blocked_local)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
if (mTabList.isEmpty()) {
newTab(activity, null, false);
}
finishInitialization();
subscriber.onComplete();
}
})
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.action_open, new DialogInterface.OnClickListener() {
@Override
@ -179,14 +191,20 @@ public class TabsManager { @@ -179,14 +191,20 @@ public class TabsManager {
}).show();
} else {
newTab(activity, url, false);
if (mTabList.isEmpty()) {
newTab(activity, null, false);
}
finishInitialization();
subscriber.onComplete();
}
if (mTabList.size() == 0) {
} else {
if (mTabList.isEmpty()) {
newTab(activity, null, false);
}
finishInitialization();
subscriber.onComplete();
}
}
});
}

7
app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.java

@ -236,11 +236,15 @@ public class BrowserPresenter { @@ -236,11 +236,15 @@ public class BrowserPresenter {
@Override
public void onClick(DialogInterface dialog, int which) {
newTab(url, true);
mShouldClose = true;
LightningView tab = mTabsModel.lastTab();
if (tab != null) {
tab.setTag(true);
}
}
});
} else {
newTab(url, true);
}
mShouldClose = true;
LightningView tab = mTabsModel.lastTab();
if (tab != null) {
@ -248,6 +252,7 @@ public class BrowserPresenter { @@ -248,6 +252,7 @@ public class BrowserPresenter {
}
}
}
}
});
}

Loading…
Cancel
Save