Fix:Core:Some android fixes

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2476 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/Makefile.am b/navit/Makefile.am
index c19cd80..2bf6ffd 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -49,13 +49,15 @@ if SUPPORT_ANDROID
   osm2navit_LDADD =
 
 android/build.xml: android/AndroidManifest.xml
+       if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android $(builddir)/android; fi
        android update project -t 3 -p android
 
 apk: all-am android/build.xml
        mkdir -p android/libs/armeabi
        cp .libs/*.so */*/.libs/*.so android/libs/armeabi
-       for i in $(shell cd xpm && echo *.xpm); do convert xpm/$$i android/res/drawable/$${i%.xpm}.png; done 
-       for i in $(shell cd xpm && echo *.png); do cp xpm/$$i android/res/drawable/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
+       for i in $(shell cd $(srcdir)/xpm && echo *.xpm); do convert $(srcdir)xpm/$$i android/res/drawable/$${i%.xpm}.png; done 
+       for i in $(shell cd $(srcdir)/xpm && echo *.png); do cp $(srcdir)/xpm/$$i android/res/drawable/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
+       if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do cp $(builddir)/xpm/$$i android/res/drawable/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
        mkdir -p android/res/raw
        for i in $(shell cd ../po && echo *.mo); do cp ../po/$$i android/res/raw/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
        cd android && ant debug

diff --git a/navit/android.c b/navit/android.c
index 87a0132..696f1aa 100644 (file)
--- a/navit/android.c
+++ b/navit/android.c
@@ -88,7 +88,7 @@ Java_org_navitproject_navit_NavitTimeout_TimeoutCallback( JNIEnv* env, jobject t
 {
        dbg(1,"enter %p %d %p\n",thiz, delete, (void *)id);
        callback_call_0((struct callback *)id);
-       if (delete)
+       if (delete) 
                (*jnienv)->DeleteGlobalRef(jnienv, thiz);
 }
 

diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 1528e37..da7d8b1 100644 (file)
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -73,17 +73,17 @@ public class NavitGraphics {
                int x=(int)event.getX();
                int y=(int)event.getY();
                if (action == MotionEvent.ACTION_DOWN) {
-                       Log.e("NavitGraphics", "onTouch down");
+                       // Log.e("NavitGraphics", "onTouch down");
                        ButtonCallback(ButtonCallbackID, 1, 1, x, y);
                }
                if (action == MotionEvent.ACTION_UP) {
-                       Log.e("NavitGraphics", "onTouch up");
+                       // Log.e("NavitGraphics", "onTouch up");
                        ButtonCallback(ButtonCallbackID, 0, 1, x, y);
                        // if (++count == 3)
                        //      Debug.stopMethodTracing();
                }
                if (action == MotionEvent.ACTION_MOVE) {
-                       Log.e("NavitGraphics", "onTouch move");
+                       // Log.e("NavitGraphics", "onTouch move");
                        MotionCallback(MotionCallbackID, x, y);
                }
                return true;

diff --git a/navit/android/src/org/navitproject/navit/NavitTimeout.java b/navit/android/src/org/navitproject/navit/NavitTimeout.java
index 33bd7c3..a88be6b 100644 (file)
--- a/navit/android/src/org/navitproject/navit/NavitTimeout.java
+++ b/navit/android/src/org/navitproject/navit/NavitTimeout.java
@@ -35,12 +35,10 @@ public class NavitTimeout implements Runnable {
        private boolean event_multi;
        private int event_callbackid;
        private int event_timeout;
-       private Runnable runnable;
        public native void TimeoutCallback(int del, int id);
 
        NavitTimeout(int timeout, boolean multi, int callbackid) 
        {
-               final NavitTimeout navittimeout=this;
                event_timeout=timeout;  
                event_multi=multi;
                event_callbackid=callbackid;
@@ -56,7 +54,7 @@ public class NavitTimeout implements Runnable {
        }
        public void remove()
        {
-               handler.removeCallbacks(runnable);
+               handler.removeCallbacks(this);
        }
 }