File tree Expand file tree Collapse file tree
app/src/main/java/com/jtmcn/archwiki/viewer Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -178,8 +178,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
178178 switch (item .getItemId ()) {
179179 case R .id .menu_share :
180180 WikiPage wikiPage = wikiViewer .getCurrentWebPage ();
181- Intent intent = AndroidUtils .shareText (wikiPage .getPageTitle (), wikiPage .getPageUrl (), this );
182- shareActionProvider .setShareIntent (intent );
181+ if (wikiPage != null ) {
182+ Intent intent = AndroidUtils .shareText (wikiPage .getPageTitle (), wikiPage .getPageUrl (), this );
183+ shareActionProvider .setShareIntent (intent );
184+ }
183185 break ;
184186 case R .id .refresh :
185187 wikiViewer .onRefresh ();
Original file line number Diff line number Diff line change @@ -173,18 +173,20 @@ public void onFinish(WikiPage results) {
173173 public void refreshPage () {
174174 lastLoadedUrl = null ; // set to null if page should restore position, otherwise start at top of page
175175 WikiPage currentWebPage = getCurrentWebPage ();
176- final int scrollPosition = currentWebPage .getScrollPosition ();
177-
178- String url = currentWebPage .getPageUrl ();
179- showProgress ();
180- Fetch .page (new FetchUrl .OnFinish <WikiPage >() {
181- @ Override
182- public void onFinish (WikiPage wikiPage ) {
183- webpageStack .pop ();
184- webpageStack .push (wikiPage );
185- wikiPage .setScrollPosition (scrollPosition );
186- loadWikiHtml (wikiPage );
187- }
188- }, url , false );
176+ if (currentWebPage != null ) {
177+ final int scrollPosition = currentWebPage .getScrollPosition ();
178+
179+ String url = currentWebPage .getPageUrl ();
180+ showProgress ();
181+ Fetch .page (new FetchUrl .OnFinish <WikiPage >() {
182+ @ Override
183+ public void onFinish (WikiPage wikiPage ) {
184+ webpageStack .pop ();
185+ webpageStack .push (wikiPage );
186+ wikiPage .setScrollPosition (scrollPosition );
187+ loadWikiHtml (wikiPage );
188+ }
189+ }, url , false );
190+ }
189191 }
190192}
You can’t perform that action at this time.
0 commit comments