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

Naming dialog builder field correctly

master
anthony restaino 8 years ago
parent
b9bbeeee7b
commit
fdc27cced2
1 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      app/src/main/java/acr/browser/lightning/view/LightningView.java

42
app/src/main/java/acr/browser/lightning/view/LightningView.java
Unescape 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) {
@ -249,15 +249,15 @@ public class LightningView {
*/ */
public void loadDownloadspage() { public void loadDownloadspage() {
new DownloadsPage().getDownloadsPage() new DownloadsPage().getDownloadsPage()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.main()) .observeOn(Schedulers.main())
.subscribe(new SingleOnSubscribe<String>() { .subscribe(new SingleOnSubscribe<String>() {
@Override @Override
public void onItem(@Nullable String item) { public void onItem(@Nullable String item) {
Preconditions.checkNonNull(item); Preconditions.checkNonNull(item);
loadUrl(item); loadUrl(item);
} }
}); });
} }
/** /**
@ -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);
} }
} }
} }

Write Preview
Loading…
Cancel
Save