pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Some minor fixes to avoid possible crash (analyzed GP crash statistics).

Browse source
This commit is contained in:
vng 2014-01-25 13:13:17 +03:00 • committed by Alex Zolotarev
parent 02d62e4bc3
commit 9087fc5364
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/country/DownloadAdapter.java
View file

@ -558,7 +558,8 @@ class DownloadAdapter extends BaseAdapter
if (v != null)
{
final DownloadAdapter.ViewHolder holder = (DownloadAdapter.ViewHolder) v.getTag();
holder.mProgress.setProgress((int) (current*100/total));
if (holder != null)
holder.mProgress.setProgress((int) (current*100/total));
}
}
}

8
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -29,10 +29,7 @@ import com.mapswithme.maps.MWMActivity.OpenUrlTask;
import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.maps.api.Const;
import com.mapswithme.maps.api.ParsedMmwRequest;
import com.mapswithme.maps.background.Notifier;
import com.mapswithme.maps.base.MapsWithMeBaseActivity;
import com.mapswithme.maps.guides.GuideInfo;
import com.mapswithme.maps.guides.GuidesUtils;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.state.SuppotedState;
import com.mapswithme.util.ConnectionState;
@ -435,7 +432,8 @@ public class DownloadResourcesActivity extends MapsWithMeBaseActivity
{
String path = null;
File tmpFile = null;
if (!data.getScheme().equalsIgnoreCase("file"))
final String scheme = data.getScheme();
if (scheme != null && !scheme.equalsIgnoreCase("file"))
{
// scheme is "content" or "http" - need to download file first
InputStream input = null;
@ -491,7 +489,7 @@ public class DownloadResourcesActivity extends MapsWithMeBaseActivity
success = loadKMZFile(path);
}
else
Log.w(TAG, "Can't get bookmarks file from URI: " + data.getPath());
Log.w(TAG, "Can't get bookmarks file from URI: " + data);
if (tmpFile != null)
tmpFile.delete();