cleanup:android:Some more indentation cleanup and case fix

3 files changed, 226 insertions, 232 deletions

diff --git a/navit/android/src/org/navitproject/navit/FileBrowserActivity.java b/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
index 6151649d1..44f907a55 100644
--- a/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
+++ b/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
@@ -2,7 +2,7 @@ package org.navitproject.navit;
 
 //Heavily based on code from
 //https://github.com/mburman/Android-File-Explore
-//	Version of Aug 13, 2011
+// Version of Aug 13, 2011
 //Also contributed:
 //  Sugan Krishnan (https://github.com/rgksugan) - Jan 2013.
 //
@@ -237,9 +237,8 @@ public class FileBrowserActivity extends Activity {
                     } else { // if(sel.canRead()) {
                         showToast("Path does not exist or cannot be read");
                     } // } else {//if(sel.canRead()) {
-                } // if (sel.isDirectory()) {
-                // File picked or an empty directory message clicked
-                else { // if (sel.isDirectory()) {
+                } else { // if (sel.isDirectory()) {
+                    // File picked or an empty directory message clicked
                     Log.d(LOGTAG, "item clicked");
                     if (!directoryShownIsEmpty) {
                         Log.d(LOGTAG, "File selected:" + chosenFile);
@@ -300,9 +299,7 @@ public class FileBrowserActivity extends Activity {
             for (int i = 0; i < fList.length; i++) {
                 // Convert into file path
                 File sel = new File(path, fList[i]);
-                Log.d(LOGTAG,
-                      "File:" + fList[i] + " readable:"
-                      + (Boolean.valueOf(sel.canRead())).toString());
+                Log.d(LOGTAG, "File:" + fList[i] + " readable:" + (Boolean.valueOf(sel.canRead())).toString());
                 int drawableID = R.drawable.file_icon;
                 boolean canRead = sel.canRead();
                 // Set drawables
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index b1b9e13a9..2ee446353 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -157,11 +157,11 @@ public class NavitGraphics {
         @Override
         public boolean onMenuItemClick(MenuItem item) {
             switch (item.getItemId()) {
-            case 1:
-                Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal()
-                                             , (int)mPressedPosition.x, (int)mPressedPosition.y);
-                msg.sendToTarget();
-                break;
+                case 1:
+                    Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal()
+                            , (int)mPressedPosition.x, (int)mPressedPosition.y);
+                    msg.sendToTarget();
+                    break;
             }
             return false;
         }
@@ -196,8 +196,7 @@ public class NavitGraphics {
         protected void onSizeChanged(int w, int h, int oldw, int oldh) {
             Log.d(TAG, "onSizeChanged pixels x=" + w + " pixels y=" + h);
             Log.d(TAG, "onSizeChanged density=" + Navit.metrics.density);
-            Log.d(TAG, "onSizeChanged scaledDensity="
-                  + Navit.metrics.scaledDensity);
+            Log.d(TAG, "onSizeChanged scaledDensity=" + Navit.metrics.scaledDensity);
             super.onSizeChanged(w, h, oldw, oldh);
 
             handleResize(w, h);
@@ -251,63 +250,63 @@ public class NavitGraphics {
                 Log.d(TAG, "ACTION_UP");
 
                 switch (touch_mode) {
-                case DRAG:
-                    Log.d(TAG, "onTouch move");
-
-                    MotionCallback(MotionCallbackID, x, y);
-                    ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
-
-                    break;
-                case ZOOM:
-                    float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                    float scale = 0;
-                    if (newDist > 10f) {
-                        scale = newDist / oldDist;
-                    }
+                    case DRAG:
+                        Log.d(TAG, "onTouch move");
+
+                        MotionCallback(MotionCallbackID, x, y);
+                        ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+
+                        break;
+                    case ZOOM:
+                        float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                        float scale = 0;
+                        if (newDist > 10f) {
+                            scale = newDist / oldDist;
+                        }
 
-                    if (scale > 1.3) {
-                        // zoom in
-                        CallbackMessageChannel(1, null);
-                    } else if (scale < 0.8) {
-                        // zoom out
-                        CallbackMessageChannel(2, null);
-                    }
-                    break;
-                case PRESSED:
-                    if (in_map) {
-                        ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                    }
-                    ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+                        if (scale > 1.3) {
+                            // zoom in
+                            CallbackMessageChannel(1, null);
+                        } else if (scale < 0.8) {
+                            // zoom out
+                            CallbackMessageChannel(2, null);
+                        }
+                        break;
+                    case PRESSED:
+                        if (in_map) {
+                            ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                        }
+                        ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
 
-                    break;
+                        break;
                 }
                 touch_mode = NONE;
             } else if (switch_value == MotionEvent.ACTION_MOVE) {
                 switch (touch_mode) {
-                case DRAG:
-                    MotionCallback(MotionCallbackID, x, y);
-                    break;
-                case ZOOM:
-                    float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                    float scale = newDist / oldDist;
-                    Log.d(TAG, "New scale = " + scale);
-                    if (scale > 1.2) {
-                        // zoom in
-                        CallbackMessageChannel(1, "");
-                        oldDist = newDist;
-                    } else if (scale < 0.8) {
-                        oldDist = newDist;
-                        // zoom out
-                        CallbackMessageChannel(2, "");
-                    }
-                    break;
-                case PRESSED:
-                    Log.d(TAG, "Start drag mode");
-                    if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
-                        ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                        touch_mode = DRAG;
-                    }
-                    break;
+                    case DRAG:
+                        MotionCallback(MotionCallbackID, x, y);
+                        break;
+                    case ZOOM:
+                        float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                        float scale = newDist / oldDist;
+                        Log.d(TAG, "New scale = " + scale);
+                        if (scale > 1.2) {
+                            // zoom in
+                            CallbackMessageChannel(1, "");
+                            oldDist = newDist;
+                        } else if (scale < 0.8) {
+                            oldDist = newDist;
+                            // zoom out
+                            CallbackMessageChannel(2, "");
+                        }
+                        break;
+                    case PRESSED:
+                        Log.d(TAG, "Start drag mode");
+                        if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
+                            ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                            touch_mode = DRAG;
+                        }
+                        break;
                 }
             } else if (switch_value == _ACTION_POINTER_DOWN_) {
                 oldDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
@@ -348,89 +347,89 @@ public class NavitGraphics {
             i = event.getUnicodeChar();
             if (i == 0) {
                 switch (keyCode) {
-                case KeyEvent.KEYCODE_DEL:
-                    s = String.valueOf((char) 8);
-                    break;
-                case KeyEvent.KEYCODE_MENU:
-                    if (!in_map) {
-                        // if last menukeypress is less than 0.2 seconds away then count longpress
-                        if ((System.currentTimeMillis() - Navit.last_pressed_menu_key) < interval_for_long_press) {
-                            Navit.time_pressed_menu_key = Navit.time_pressed_menu_key
-                                                          + (System.currentTimeMillis() - Navit.last_pressed_menu_key);
-                            // on long press let softkeyboard popup
-                            if (Navit.time_pressed_menu_key > time_for_long_press) {
-                                Navit.show_soft_keyboard = true;
+                    case KeyEvent.KEYCODE_DEL:
+                        s = String.valueOf((char) 8);
+                        break;
+                    case KeyEvent.KEYCODE_MENU:
+                        if (!in_map) {
+                            // if last menukeypress is less than 0.2 seconds away then count longpress
+                            if ((System.currentTimeMillis() - Navit.last_pressed_menu_key) < interval_for_long_press) {
+                                Navit.time_pressed_menu_key = Navit.time_pressed_menu_key
+                                    + (System.currentTimeMillis() - Navit.last_pressed_menu_key);
+                                // on long press let softkeyboard popup
+                                if (Navit.time_pressed_menu_key > time_for_long_press) {
+                                    Navit.show_soft_keyboard = true;
+                                    Navit.time_pressed_menu_key = 0L;
+                                    // need to draw to get the keyboard showing
+                                    this.postInvalidate();
+                                }
+                            } else {
                                 Navit.time_pressed_menu_key = 0L;
-                                // need to draw to get the keyboard showing
-                                this.postInvalidate();
                             }
+                            Navit.last_pressed_menu_key = System.currentTimeMillis();
+                            // if in menu view:
+                            // use as OK (Enter) key
+                            // dont use menu key here (use it in onKeyUp)
+                            return true;
                         } else {
-                            Navit.time_pressed_menu_key = 0L;
+                            // if on map view:
+                            // volume UP
+                            //s = java.lang.String.valueOf((char) 1);
+                            return true;
+                        }
+                    case KeyEvent.KEYCODE_SEARCH:
+                        /* Handle event in Main Activity if map is shown */
+                        if (in_map) {
+                            return false;
                         }
-                        Navit.last_pressed_menu_key = System.currentTimeMillis();
-                        // if in menu view:
-                        // use as OK (Enter) key
-                        // dont use menu key here (use it in onKeyUp)
-                        return true;
-                    } else {
-                        // if on map view:
-                        // volume UP
-                        //s = java.lang.String.valueOf((char) 1);
-                        return true;
-                    }
-                case KeyEvent.KEYCODE_SEARCH:
-                    /* Handle event in Main Activity if map is shown */
-                    if (in_map) {
-                        return false;
-                    }
 
-                    s = String.valueOf((char) 19);
-                    break;
-                case KeyEvent.KEYCODE_BACK:
-                    s = String.valueOf((char) 27);
-                    break;
-                case KeyEvent.KEYCODE_CALL:
-                    s = String.valueOf((char) 3);
-                    break;
-                case KeyEvent.KEYCODE_VOLUME_UP:
-                    if (!in_map) {
-                        // if in menu view:
-                        // use as UP key
-                        s = String.valueOf((char) 16);
-                    } else {
-                        // if on map view:
-                        // volume UP
-                        //s = java.lang.String.valueOf((char) 21);
-                        return false;
-                    }
-                    break;
-                case KeyEvent.KEYCODE_VOLUME_DOWN:
-                    if (!in_map) {
-                        // if in menu view:
-                        // use as DOWN key
+                        s = String.valueOf((char) 19);
+                        break;
+                    case KeyEvent.KEYCODE_BACK:
+                        s = String.valueOf((char) 27);
+                        break;
+                    case KeyEvent.KEYCODE_CALL:
+                        s = String.valueOf((char) 3);
+                        break;
+                    case KeyEvent.KEYCODE_VOLUME_UP:
+                        if (!in_map) {
+                            // if in menu view:
+                            // use as UP key
+                            s = String.valueOf((char) 16);
+                        } else {
+                            // if on map view:
+                            // volume UP
+                            //s = java.lang.String.valueOf((char) 21);
+                            return false;
+                        }
+                        break;
+                    case KeyEvent.KEYCODE_VOLUME_DOWN:
+                        if (!in_map) {
+                            // if in menu view:
+                            // use as DOWN key
+                            s = String.valueOf((char) 14);
+                        } else {
+                            // if on map view:
+                            // volume DOWN
+                            //s = java.lang.String.valueOf((char) 4);
+                            return false;
+                        }
+                        break;
+                    case KeyEvent.KEYCODE_DPAD_CENTER:
+                        s = String.valueOf((char) 13);
+                        break;
+                    case KeyEvent.KEYCODE_DPAD_DOWN:
                         s = String.valueOf((char) 14);
-                    } else {
-                        // if on map view:
-                        // volume DOWN
-                        //s = java.lang.String.valueOf((char) 4);
-                        return false;
-                    }
-                    break;
-                case KeyEvent.KEYCODE_DPAD_CENTER:
-                    s = String.valueOf((char) 13);
-                    break;
-                case KeyEvent.KEYCODE_DPAD_DOWN:
-                    s = String.valueOf((char) 14);
-                    break;
-                case KeyEvent.KEYCODE_DPAD_LEFT:
-                    s = String.valueOf((char) 2);
-                    break;
-                case KeyEvent.KEYCODE_DPAD_RIGHT:
-                    s = String.valueOf((char) 6);
-                    break;
-                case KeyEvent.KEYCODE_DPAD_UP:
-                    s = String.valueOf((char) 16);
-                    break;
+                        break;
+                    case KeyEvent.KEYCODE_DPAD_LEFT:
+                        s = String.valueOf((char) 2);
+                        break;
+                    case KeyEvent.KEYCODE_DPAD_RIGHT:
+                        s = String.valueOf((char) 6);
+                        break;
+                    case KeyEvent.KEYCODE_DPAD_UP:
+                        s = String.valueOf((char) 16);
+                        break;
                 }
             } else if (i == 10) {
                 s = java.lang.String.valueOf((char) 13);
@@ -450,38 +449,38 @@ public class NavitGraphics {
 
             if (i == 0) {
                 switch (keyCode) {
-                case KeyEvent.KEYCODE_VOLUME_UP:
-                    return (!in_map);
-                case KeyEvent.KEYCODE_VOLUME_DOWN:
-                    return (!in_map);
-                case KeyEvent.KEYCODE_SEARCH:
-                    /* Handle event in Main Activity if map is shown */
-                    if (in_map) {
-                        return false;
-                    }
-                    break;
-                case KeyEvent.KEYCODE_BACK:
-                    if (Navit.show_soft_keyboard_now_showing) {
-                        Navit.show_soft_keyboard_now_showing = false;
-                    }
-                    //s = java.lang.String.valueOf((char) 27);
-                    return true;
-                case KeyEvent.KEYCODE_MENU:
-                    if (!in_map) {
+                    case KeyEvent.KEYCODE_VOLUME_UP:
+                        return (!in_map);
+                    case KeyEvent.KEYCODE_VOLUME_DOWN:
+                        return (!in_map);
+                    case KeyEvent.KEYCODE_SEARCH:
+                        /* Handle event in Main Activity if map is shown */
+                        if (in_map) {
+                            return false;
+                        }
+                        break;
+                    case KeyEvent.KEYCODE_BACK:
                         if (Navit.show_soft_keyboard_now_showing) {
-                            // if soft keyboard showing on screen, dont use menu button as select key
+                            Navit.show_soft_keyboard_now_showing = false;
+                        }
+                        //s = java.lang.String.valueOf((char) 27);
+                        return true;
+                    case KeyEvent.KEYCODE_MENU:
+                        if (!in_map) {
+                            if (Navit.show_soft_keyboard_now_showing) {
+                                // if soft keyboard showing on screen, dont use menu button as select key
+                            } else {
+                                // if in menu view:
+                                // use as OK (Enter) key
+                                s = String.valueOf((char) 13);
+                            }
                         } else {
-                            // if in menu view:
-                            // use as OK (Enter) key
-                            s = String.valueOf((char) 13);
+                            // if on map view:
+                            // volume UP
+                            //s = java.lang.String.valueOf((char) 1);
+                            return false;
                         }
-                    } else {
-                        // if on map view:
-                        // volume UP
-                        //s = java.lang.String.valueOf((char) 1);
-                        return false;
-                    }
-                    break;
+                        break;
                 }
             } else if (i != 10) {
                 s = java.lang.String.valueOf((char) i);
@@ -555,7 +554,7 @@ public class NavitGraphics {
     }
 
     public NavitGraphics(final Activity activity, NavitGraphics parent, int x, int y, int w, int h,
-                         int wraparound, int use_camera) {
+            int wraparound, int use_camera) {
         if (parent == null) {
             this.activity = (Navit) activity;
             view = new NavitView(activity);
@@ -599,7 +598,7 @@ public class NavitGraphics {
 
     public enum msg_type {
         CLB_ZOOM_IN, CLB_ZOOM_OUT, CLB_REDRAW, CLB_MOVE, CLB_BUTTON_UP, CLB_BUTTON_DOWN, CLB_SET_DESTINATION
-        , CLB_SET_DISPLAY_DESTINATION, CLB_CALL_CMD, CLB_COUNTRY_CHOOSER, CLB_LOAD_MAP, CLB_UNLOAD_MAP, CLB_DELETE_MAP
+            , CLB_SET_DISPLAY_DESTINATION, CLB_CALL_CMD, CLB_COUNTRY_CHOOSER, CLB_LOAD_MAP, CLB_UNLOAD_MAP, CLB_DELETE_MAP
     }
 
     static private final msg_type[] msg_values = msg_type.values();
@@ -607,48 +606,48 @@ public class NavitGraphics {
     public final Handler    callback_handler    = new Handler() {
         public void handleMessage(Message msg) {
             switch (msg_values[msg.what]) {
-            case CLB_ZOOM_IN:
-                CallbackMessageChannel(1, "");
-                break;
-            case CLB_ZOOM_OUT:
-                CallbackMessageChannel(2, "");
-                break;
-            case CLB_MOVE:
-                MotionCallback(MotionCallbackID, msg.getData().getInt("x"), msg.getData().getInt("y"));
-                break;
-            case CLB_SET_DESTINATION:
-                String lat = Float.toString(msg.getData().getFloat("lat"));
-                String lon = Float.toString(msg.getData().getFloat("lon"));
-                String q = msg.getData().getString(("q"));
-                CallbackMessageChannel(3, lat + "#" + lon + "#" + q);
-                break;
-            case CLB_SET_DISPLAY_DESTINATION:
-                int x = msg.arg1;
-                int y = msg.arg2;
-                CallbackMessageChannel(4, "" + x + "#" + y);
-                break;
-            case CLB_CALL_CMD:
-                String cmd = msg.getData().getString(("cmd"));
-                CallbackMessageChannel(5, cmd);
-                break;
-            case CLB_BUTTON_UP:
-                ButtonCallback(ButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // up
-                break;
-            case CLB_BUTTON_DOWN:
-                ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // down
-                break;
-            case CLB_COUNTRY_CHOOSER:
-                break;
-            case CLB_LOAD_MAP:
-                CallbackMessageChannel(6, msg.getData().getString(("title")));
-                break;
-            case CLB_DELETE_MAP:
-                File toDelete = new File( msg.getData().getString(("title")));
-                toDelete.delete();
-            //fallthrough
-            case CLB_UNLOAD_MAP:
-                CallbackMessageChannel(7, msg.getData().getString(("title")));
-                break;
+                case CLB_ZOOM_IN:
+                    CallbackMessageChannel(1, "");
+                    break;
+                case CLB_ZOOM_OUT:
+                    CallbackMessageChannel(2, "");
+                    break;
+                case CLB_MOVE:
+                    MotionCallback(MotionCallbackID, msg.getData().getInt("x"), msg.getData().getInt("y"));
+                    break;
+                case CLB_SET_DESTINATION:
+                    String lat = Float.toString(msg.getData().getFloat("lat"));
+                    String lon = Float.toString(msg.getData().getFloat("lon"));
+                    String q = msg.getData().getString(("q"));
+                    CallbackMessageChannel(3, lat + "#" + lon + "#" + q);
+                    break;
+                case CLB_SET_DISPLAY_DESTINATION:
+                    int x = msg.arg1;
+                    int y = msg.arg2;
+                    CallbackMessageChannel(4, "" + x + "#" + y);
+                    break;
+                case CLB_CALL_CMD:
+                    String cmd = msg.getData().getString(("cmd"));
+                    CallbackMessageChannel(5, cmd);
+                    break;
+                case CLB_BUTTON_UP:
+                    ButtonCallback(ButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // up
+                    break;
+                case CLB_BUTTON_DOWN:
+                    ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // down
+                    break;
+                case CLB_COUNTRY_CHOOSER:
+                    break;
+                case CLB_LOAD_MAP:
+                    CallbackMessageChannel(6, msg.getData().getString(("title")));
+                    break;
+                case CLB_DELETE_MAP:
+                    File toDelete = new File( msg.getData().getString(("title")));
+                    toDelete.delete();
+                    //fallthrough
+                case CLB_UNLOAD_MAP:
+                    CallbackMessageChannel(7, msg.getData().getString(("title")));
+                    break;
             }
         }
     };
@@ -719,16 +718,16 @@ public class NavitGraphics {
          * (platform/frameworks/base/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java)
          */
         final Boolean isLandscape = (navit.getResources().getConfiguration().orientation ==
-                                     Configuration.ORIENTATION_LANDSCAPE);
+                Configuration.ORIENTATION_LANDSCAPE);
         final Boolean isNavAtBottom = (!isLandscape) || (navit.getResources().getConfiguration().smallestScreenWidthDp >= 600);
         Log.d(TAG, String.format("isNavAtBottom=%b (Configuration.smallestScreenWidthDp=%d, isLandscape=%b)",
-                                 isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
+                    isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
 
         int left = 0;
         int top = isStatusShowing ? Navit.status_bar_height : 0;
         int right = (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0;
         final int bottom = (!(isNavShowing
-                              && isNavAtBottom)) ? 0 : isLandscape ? Navit.navigation_bar_height_landscape : Navit.navigation_bar_height;
+                    && isNavAtBottom)) ? 0 : isLandscape ? Navit.navigation_bar_height_landscape : Navit.navigation_bar_height;
 
         /* hide tint bars during update to prevent ugly effects */
         statusTintView.setVisibility(View.GONE);
@@ -745,15 +744,15 @@ public class NavitGraphics {
                 statusLayoutParams.setMargins(0, 0, (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0, 0);
                 statusTintView.setLayoutParams(statusLayoutParams);
                 Log.d(TAG, String.format("statusTintView: width=%d height=%d",
-                                         statusTintView.getWidth(), statusTintView.getHeight()));
+                            statusTintView.getWidth(), statusTintView.getHeight()));
                 navigationTintView.setVisibility(isNavShowing ? View.VISIBLE : View.GONE);
                 LayoutParams navigationLayoutParams = new FrameLayout.LayoutParams(
-                    isNavAtBottom ? LayoutParams.MATCH_PARENT : Navit.navigation_bar_width,  // X
-                    isNavAtBottom ? bottom : LayoutParams.MATCH_PARENT, // Y
-                    Gravity.BOTTOM | Gravity.RIGHT);
+                        isNavAtBottom ? LayoutParams.MATCH_PARENT : Navit.navigation_bar_width,  // X
+                        isNavAtBottom ? bottom : LayoutParams.MATCH_PARENT, // Y
+                        Gravity.BOTTOM | Gravity.RIGHT);
                 navigationTintView.setLayoutParams(navigationLayoutParams);
                 Log.d(TAG, String.format("navigationTintView: width=%d height=%d",
-                                         navigationTintView.getWidth(), navigationTintView.getHeight()));
+                            navigationTintView.getWidth(), navigationTintView.getHeight()));
             }
         });
 
@@ -839,16 +838,14 @@ public class NavitGraphics {
 
 
     protected void draw_polyline(Paint paint, int[] c) {
-        int i, ndashes;
-        float [] intervals;
         paint.setStrokeWidth(c[0]);
         paint.setARGB(c[1],c[2],c[3],c[4]);
         paint.setStyle(Paint.Style.STROKE);
         //paint.setAntiAlias(true);
         //paint.setStrokeWidth(0);
-        ndashes = c[5];
-        intervals = new float[ndashes + (ndashes % 2)];
-        for (i = 0; i < ndashes; i++) {
+        int ndashes = c[5];
+        float[] intervals = new float[ndashes + (ndashes % 2)];
+        for (int i = 0; i < ndashes; i++) {
             intervals[i] = c[6 + i];
         }
 
@@ -862,7 +859,7 @@ public class NavitGraphics {
 
         Path path = new Path();
         path.moveTo(c[6 + ndashes], c[7 + ndashes]);
-        for (i = 8 + ndashes; i < c.length; i += 2) {
+        for (int i = 8 + ndashes; i < c.length; i += 2) {
             path.lineTo(c[i], c[i + 1]);
         }
         //global_path.close();
@@ -955,7 +952,7 @@ public class NavitGraphics {
      * TODO make it work with rectangular tiles as well ?
      */
     protected void draw_image_warp(Paint paint, int count, int p0x, int p0y, int p1x, int p1y, int p2x, int p2y,
-                                   Bitmap bitmap) {
+            Bitmap bitmap) {
 
         float width;
         float scale;
diff --git a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
index b7567f97a..e4c774fb9 100644
--- a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
@@ -106,8 +106,8 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
         } finally {
             try {
                 /* Close Stream to prevent Resource leak */
-                if (preferenceOIS != null) {
-                    preferenceOIS.close();
+                if (preferenceOis != null) {
+                    preferenceOis.close();
                 }
             } catch (IOException e) {
                 // Catching but ignoring that exception when closing the stream