Add checks to avoid NPEs

kevinhinterlong · Jul 20, 2017 · 27ee4aa · 27ee4aa
1 parent 7f47030
commit 27ee4aa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/app/src/main/java/com/jtmcn/archwiki/viewer/MainActivity.java b/app/src/main/java/com/jtmcn/archwiki/viewer/MainActivity.java
@@ -178,8 +178,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.menu_share:
 				WikiPage wikiPage = wikiViewer.getCurrentWebPage();
-				Intent intent = AndroidUtils.shareText(wikiPage.getPageTitle(), wikiPage.getPageUrl(), this);
-				shareActionProvider.setShareIntent(intent);
+				if (wikiPage != null) {
+					Intent intent = AndroidUtils.shareText(wikiPage.getPageTitle(), wikiPage.getPageUrl(), this);
+					shareActionProvider.setShareIntent(intent);
+				}
 				break;
 			case R.id.refresh:
 				wikiViewer.onRefresh();

diff --git a/app/src/main/java/com/jtmcn/archwiki/viewer/WikiClient.java b/app/src/main/java/com/jtmcn/archwiki/viewer/WikiClient.java
@@ -173,18 +173,20 @@ public void onFinish(WikiPage results) {
 	public void refreshPage() {
 		lastLoadedUrl = null; // set to null if page should restore position, otherwise start at top of page
 		WikiPage currentWebPage = getCurrentWebPage();
-		final int scrollPosition = currentWebPage.getScrollPosition();
-
-		String url = currentWebPage.getPageUrl();
-		showProgress();
-		Fetch.page(new FetchUrl.OnFinish<WikiPage>() {
-			@Override
-			public void onFinish(WikiPage wikiPage) {
-				webpageStack.pop();
-				webpageStack.push(wikiPage);
-				wikiPage.setScrollPosition(scrollPosition);
-				loadWikiHtml(wikiPage);
-			}
-		}, url, false);
+		if (currentWebPage != null) {
+			final int scrollPosition = currentWebPage.getScrollPosition();
+
+			String url = currentWebPage.getPageUrl();
+			showProgress();
+			Fetch.page(new FetchUrl.OnFinish<WikiPage>() {
+				@Override
+				public void onFinish(WikiPage wikiPage) {
+					webpageStack.pop();
+					webpageStack.push(wikiPage);
+					wikiPage.setScrollPosition(scrollPosition);
+					loadWikiHtml(wikiPage);
+				}
+			}, url, false);
+		}
 	}
 }