From 191ea4a7bbcb22d70c648a9ba746f1061e6f74cb Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 13 Jun 2014 15:53:30 -0700 Subject: [PATCH] altosdroid: Don't crash when the map is touched The map 'canScroll' method was crashing when dereferencing a null value somewhere. Just check all of them and bail instead of crashing. Signed-off-by: Keith Packard --- .../src/org/altusmetrum/AltosDroid/AltosViewPager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java index ebddc266..223ae75a 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java @@ -34,10 +34,14 @@ public class AltosViewPager extends ViewPager { @Override protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) { - if(v.getClass().getPackage().getName().startsWith("maps.")){ + if(v.getClass() != null && + v.getClass().getPackage() != null && + v.getClass().getPackage().getName() != null && + v.getClass().getPackage().getName().startsWith("maps.")) + { return true; } return super.canScroll(v, checkV, dx, x, y); } -} \ No newline at end of file +} -- 2.30.2