Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

renamed WikiArticleHelper and removed two same methods warnAboutExternalLoad

Browse source
This commit is contained in:
Chumva 2018-05-10 11:42:16 +03:00
parent 487e3f0219
commit a48a7bce71
4 changed files with 18 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -35,7 +35,7 @@ import net.osmand.plus.Version;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.wikipedia.WikipediaArticleHelper;
import net.osmand.plus.wikipedia.WikiArticleHelper;
import net.osmand.plus.wikipedia.WikipediaArticleWikiLinkFragment;
import net.osmand.plus.wikipedia.WikipediaDialogFragment;
import net.osmand.plus.osmedit.OsmEditingPlugin;
@ -295,8 +295,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
public void onClick(View v) {
if (text.contains(".wikipedia.org/w")) {
if (Version.isPaidVersion(app)) {
WikipediaArticleHelper wikipediaArticleHelper = new WikipediaArticleHelper(mapActivity, !light);
wikipediaArticleHelper.showWikiArticle(amenity.getLocation(), text);
WikiArticleHelper wikiArticleHelper = new WikiArticleHelper(mapActivity, !light);
wikiArticleHelper.showWikiArticle(amenity.getLocation(), text);
} else {
WikipediaArticleWikiLinkFragment.showInstance(mapActivity.getSupportFragmentManager(), text);
}

8
OsmAnd/src/net/osmand/plus/wikipedia/WikipediaArticleHelper.java → OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java
View file

@ -30,9 +30,9 @@ import java.util.ArrayList;
import java.util.List;
public class WikipediaArticleHelper {
public class WikiArticleHelper {
private static final String TAG = WikipediaArticleHelper.class.getSimpleName();
private static final String TAG = WikiArticleHelper.class.getSimpleName();
private static final String ZIP_EXT = ".zip";
private static final String PAGE_PREFIX_HTTP = "http://";
private static final String PAGE_PREFIX_HTTPS = "https://";
@ -44,7 +44,7 @@ public class WikipediaArticleHelper {
private boolean nightMode;
public WikipediaArticleHelper(MapActivity mapActivity, boolean nightMode) {
public WikiArticleHelper(MapActivity mapActivity, boolean nightMode) {
this.mapActivity = mapActivity;
this.nightMode = nightMode;
}
@ -214,7 +214,7 @@ public class WikipediaArticleHelper {
}
}
private static void warnAboutExternalLoad(final String url, final Context context, final boolean nightMode) {
public static void warnAboutExternalLoad(final String url, final Context context, final boolean nightMode) {
if (context == null) {
return;
}

19
OsmAnd/src/net/osmand/plus/wikipedia/WikipediaWebViewClient.java
View file

@ -28,28 +28,11 @@ public class WikipediaWebViewClient extends WebViewClient {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
if (url.startsWith(PAGE_PREFIX_HTTP) || url.startsWith(PAGE_PREFIX_HTTPS)) {
warnAboutExternalLoad(url, context, nightMode);
WikiArticleHelper.warnAboutExternalLoad(url, context, nightMode);
} else {
Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
context.startActivity(i);
}
return true;
}
private static void warnAboutExternalLoad(final String url, final Context context, final boolean nightMode) {
if (context == null) {
return;
}
new AlertDialog.Builder(context)
.setTitle(url)
.setMessage(R.string.online_webpage_warning)
.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
WikipediaDialogFragment.showFullArticle(context, Uri.parse(url), nightMode);
}
})
.setNegativeButton(R.string.shared_string_cancel, null)
.show();
}
}

37
OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
View file

@ -19,7 +19,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.wikipedia.WikipediaArticleHelper;
import net.osmand.plus.wikipedia.WikiArticleHelper;
import net.osmand.plus.wikipedia.WikipediaDialogFragment;
import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment;
import net.osmand.plus.wikivoyage.data.TravelArticle;
@ -50,7 +50,7 @@ public class WikivoyageWebViewClient extends WebViewClient {
private static final String PAGE_PREFIX_HTTPS = "https://";
private static final String WIKIVOAYAGE_DOMAIN = ".wikivoyage.org/wiki/";
private static final String WIKI_DOMAIN = ".wikipedia.org/wiki/";
private WikipediaArticleHelper wikipediaArticleHelper;
private WikiArticleHelper wikiArticleHelper;
public WikivoyageWebViewClient(FragmentActivity context, FragmentManager fm, boolean nightMode) {
@ -58,26 +58,26 @@ public class WikivoyageWebViewClient extends WebViewClient {
fragmentManager = fm;
this.context = context;
this.nightMode = nightMode;
wikipediaArticleHelper = new WikipediaArticleHelper((MapActivity) context, nightMode);
wikiArticleHelper = new WikiArticleHelper((MapActivity) context, nightMode);
}
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
boolean isWebPage = url.startsWith(PAGE_PREFIX_HTTP) || url.startsWith(PAGE_PREFIX_HTTPS);
if (url.contains(WIKIVOAYAGE_DOMAIN) && isWebPage) {
String lang = WikipediaArticleHelper.getLang(url);
String articleName = WikipediaArticleHelper.getArticleNameFromUrl(url, lang);
String lang = WikiArticleHelper.getLang(url);
String articleName = WikiArticleHelper.getArticleNameFromUrl(url, lang);
long articleId = app.getTravelDbHelper().getArticleId(articleName, lang);
if (articleId != 0) {
WikivoyageArticleDialogFragment.showInstance(app, fragmentManager, articleId, lang);
} else {
warnAboutExternalLoad(url, context, nightMode);
WikiArticleHelper.warnAboutExternalLoad(url, context, nightMode);
}
return true;
} else if (url.contains(WIKI_DOMAIN) && isWebPage) {
wikipediaArticleHelper.showWikiArticle(new LatLon(article.getLat(), article.getLon()), url);
wikiArticleHelper.showWikiArticle(new LatLon(article.getLat(), article.getLon()), url);
} else if (isWebPage) {
warnAboutExternalLoad(url, context, nightMode);
WikiArticleHelper.warnAboutExternalLoad(url, context, nightMode);
} else if (url.startsWith(PREFIX_GEO)) {
if (article != null) {
List<GPXUtilities.WptPt> points = article.getGpxFile().getPoints();
@ -122,30 +122,13 @@ public class WikivoyageWebViewClient extends WebViewClient {
return true;
}
private static void warnAboutExternalLoad(final String url, final Context context, final boolean nightMode) {
if (context == null) {
return;
}
new AlertDialog.Builder(context)
.setTitle(url)
.setMessage(R.string.online_webpage_warning)
.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
WikipediaDialogFragment.showFullArticle(context, Uri.parse(url), nightMode);
}
})
.setNegativeButton(R.string.shared_string_cancel, null)
.show();
}
public void setArticle(TravelArticle article) {
this.article = article;
}
public void stopRunningAsyncTasks() {
if (wikipediaArticleHelper != null) {
wikipediaArticleHelper.stopSearchAsyncTask();
if (wikiArticleHelper != null) {
wikiArticleHelper.stopSearchAsyncTask();
}
}
}