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

Naming dialog builder field correctly

Browse Source
This commit is contained in:
anthony restaino 2017-06-14 21:22:09 -04:00
parent b9bbeeee7b
commit fdc27cced2
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/acr/browser/lightning/view/LightningView.java
View File

@ -105,7 +105,7 @@ public class LightningView {
@NonNull private final Map<String, String> mRequestHeaders = new ArrayMap<>(); @NonNull private final Map<String, String> mRequestHeaders = new ArrayMap<>();
@Inject PreferenceManager mPreferences; @Inject PreferenceManager mPreferences;
@Inject LightningDialogBuilder mBookmarksDialogBuilder; @Inject LightningDialogBuilder mDialogBuilder;
@Inject ProxyUtils mProxyUtils; @Inject ProxyUtils mProxyUtils;
public LightningView(@NonNull Activity activity, @Nullable String url, boolean isIncognito) { public LightningView(@NonNull Activity activity, @Nullable String url, boolean isIncognito) {
@ -990,43 +990,43 @@ public class LightningView {
if (currentUrl != null && UrlUtils.isSpecialUrl(currentUrl)) { if (currentUrl != null && UrlUtils.isSpecialUrl(currentUrl)) {
if (UrlUtils.isHistoryUrl(currentUrl)) { if (UrlUtils.isHistoryUrl(currentUrl)) {
if (url != null) { if (url != null) {
mBookmarksDialogBuilder.showLongPressedHistoryLinkDialog(mActivity, mUIController, url); mDialogBuilder.showLongPressedHistoryLinkDialog(mActivity, mUIController, url);
} else if (result != null && result.getExtra() != null) { } else if (result != null && result.getExtra() != null) {
final String newUrl = result.getExtra(); final String newUrl = result.getExtra();
mBookmarksDialogBuilder.showLongPressedHistoryLinkDialog(mActivity, mUIController, newUrl); mDialogBuilder.showLongPressedHistoryLinkDialog(mActivity, mUIController, newUrl);
} }
} else if (UrlUtils.isBookmarkUrl(currentUrl)) { } else if (UrlUtils.isBookmarkUrl(currentUrl)) {
if (url != null) { if (url != null) {
mBookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(mActivity, mUIController, url); mDialogBuilder.showLongPressedDialogForBookmarkUrl(mActivity, mUIController, url);
} else if (result != null && result.getExtra() != null) { } else if (result != null && result.getExtra() != null) {
final String newUrl = result.getExtra(); final String newUrl = result.getExtra();
mBookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(mActivity, mUIController, newUrl); mDialogBuilder.showLongPressedDialogForBookmarkUrl(mActivity, mUIController, newUrl);
} }
} else if (UrlUtils.isDownloadsUrl(currentUrl)) { } else if (UrlUtils.isDownloadsUrl(currentUrl)) {
if (url != null) { if (url != null) {
mBookmarksDialogBuilder.showLongPressedDialogForDownloadUrl(mActivity, mUIController, url); mDialogBuilder.showLongPressedDialogForDownloadUrl(mActivity, mUIController, url);
} else if (result != null && result.getExtra() != null) { } else if (result != null && result.getExtra() != null) {
final String newUrl = result.getExtra(); final String newUrl = result.getExtra();
mBookmarksDialogBuilder.showLongPressedDialogForDownloadUrl(mActivity, mUIController, newUrl); mDialogBuilder.showLongPressedDialogForDownloadUrl(mActivity, mUIController, newUrl);
} }
} }
} else { } else {
if (url != null) { if (url != null) {
if (result != null) { if (result != null) {
if (result.getType() == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE || result.getType() == WebView.HitTestResult.IMAGE_TYPE) { if (result.getType() == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE || result.getType() == WebView.HitTestResult.IMAGE_TYPE) {
mBookmarksDialogBuilder.showLongPressImageDialog(mActivity, mUIController, url, getUserAgent()); mDialogBuilder.showLongPressImageDialog(mActivity, mUIController, url, getUserAgent());
} else { } else {
mBookmarksDialogBuilder.showLongPressLinkDialog(mActivity, mUIController, url); mDialogBuilder.showLongPressLinkDialog(mActivity, mUIController, url);
} }
} else { } else {
mBookmarksDialogBuilder.showLongPressLinkDialog(mActivity, mUIController, url); mDialogBuilder.showLongPressLinkDialog(mActivity, mUIController, url);
} }
} else if (result != null && result.getExtra() != null) { } else if (result != null && result.getExtra() != null) {
final String newUrl = result.getExtra(); final String newUrl = result.getExtra();
if (result.getType() == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE || result.getType() == WebView.HitTestResult.IMAGE_TYPE) { if (result.getType() == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE || result.getType() == WebView.HitTestResult.IMAGE_TYPE) {
mBookmarksDialogBuilder.showLongPressImageDialog(mActivity, mUIController, newUrl, getUserAgent()); mDialogBuilder.showLongPressImageDialog(mActivity, mUIController, newUrl, getUserAgent());
} else { } else {
mBookmarksDialogBuilder.showLongPressLinkDialog(mActivity, mUIController, newUrl); mDialogBuilder.showLongPressLinkDialog(mActivity, mUIController, newUrl);
} }
} }
} }