organicmaps/travelguide
Archived
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #22 from deathbaba/hot-fixes

Browse source 
Hot fixes
This commit is contained in:
Viktor Govako 2013-08-14 04:55:29 -07:00
commit d6eca5d5d1
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/AndroidManifest.xml
View file

@ -2,14 +2,15 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.guidewithme.uk"
android:installLocation="preferExternal"
android:versionCode="1"
android:versionName="1.0" >
android:versionCode="2"
android:versionName="1.0.1" >
<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="18" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-feature android:name="android.hardware.location.gps" android:required="false"/>
<!-- Required to access Google Play Licensing -->
<uses-permission android:name="com.android.vending.CHECK_LICENSE" />

24
android/src/com/guidewithme/ArticleInfoDetailFragment.java
View file

@ -1,6 +1,8 @@
package com.guidewithme;
import static com.guidewithme.util.Utils.notNull;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
@ -111,8 +113,15 @@ public class ArticleInfoDetailFragment extends Fragment
public void onPageFinished(WebView view, String url)
{
super.onPageFinished(view, url);
Utils.fadeOut(getActivity(), mProgressContainer);
Utils.fadeIn(getActivity(), mWebView);
// Fix java.lang.NullPointerException at:
// android.view.animation.AnimationUtils.loadAnimation(AnimationUtils.java:71)
final Context context = getActivity();
if (notNull(context))
{
Utils.fadeOut(context, mProgressContainer);
Utils.fadeIn(context, mWebView);
}
// If picture enable zoom, else disable
final WebSettings ws = mWebView.getSettings();
@ -129,8 +138,15 @@ public class ArticleInfoDetailFragment extends Fragment
public void onPageStarted(WebView view, String url, Bitmap favicon)
{
super.onPageStarted(view, url, favicon);
Utils.fadeOut(getActivity(), mWebView);
Utils.fadeIn(getActivity(), mProgressContainer);
// Fix java.lang.NullPointerException at:
// android.view.animation.AnimationUtils.loadAnimation(AnimationUtils.java:71)
final Context context = getActivity();
if (notNull(context))
{
Utils.fadeOut(context, mWebView);
Utils.fadeIn(context, mProgressContainer);
}
if (URLUtil.isFileUrl(url) && url.endsWith(".html"))
{