r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
Anthony Restaino 2016-07-31 18:19:23 -04:00
parent 719b281bac
commit 6e108dbbff
2 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/acr/browser/lightning/activity/TabsManager.java
View File

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

15
app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.java
View File

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