From: Keith Packard <keithp@keithp.com>
Date: Fri, 13 Jun 2014 22:53:30 +0000 (-0700)
Subject: altosdroid: Don't crash when the map is touched
X-Git-Tag: 1.4~43
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=191ea4a7bbcb22d70c648a9ba746f1061e6f74cb

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 <keithp@keithp.com>
---

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
+}