Update Navit.javarefactorAndroid

1 files changed, 4 insertions, 23 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index a55fa9714..2adbc0201 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -23,20 +23,13 @@ import java.io.File;
 import java.io.FileOutputStream;

 import java.io.InputStream;

 import java.io.FileInputStream;

-import java.io.FileOutputStream;

 import java.io.IOException;

-import java.lang.reflect.Field;

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

 import java.util.HashMap;

 import java.util.Locale;

 import java.util.Map;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

-

-import android.annotation.TargetApi;

 import android.app.Activity;

-import android.app.ActivityManager.TaskDescription;

 import android.app.AlertDialog;

 import android.app.Dialog;

 import android.app.Notification;

@@ -51,9 +44,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;

 import android.content.res.Configuration;

 import android.content.res.Resources;

-import android.graphics.Bitmap;

-import android.graphics.BitmapFactory;

-import android.graphics.Color;

 import android.graphics.Point;

 import android.Manifest;

 import android.media.AudioManager;

@@ -63,11 +53,6 @@ import android.os.Bundle;
 import android.os.Environment;

 import android.os.Message;

 import android.os.PowerManager;

-import android.support.v4.app.ActivityCompat;

-import android.support.v4.content.ContextCompat;

-import android.text.SpannableString;

-import android.text.method.LinkMovementMethod;

-import android.text.util.Linkify;

 import android.util.DisplayMetrics;

 import android.util.Log;

 import android.view.Display;

@@ -77,11 +62,10 @@ import android.view.View;
 import android.view.Window;

 import android.view.WindowManager;

 import android.view.inputmethod.InputMethodManager;

-import android.widget.RelativeLayout;

-import android.widget.TextView;

 import android.widget.Toast;

 import android.support.v4.app.NotificationCompat;

-

+import android.support.v4.app.ActivityCompat;

+import android.support.v4.content.ContextCompat;

 

 public class Navit extends Activity

 {

@@ -418,7 +402,6 @@ public class Navit extends Activity
 			Log.e(TAG, "Failed to extract navit.xml for " + my_display_density);

 		}

 

-		// --> dont use android.os.Build.VERSION.SDK_INT, needs API >= 4

 		Log.d(TAG, "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));

 		NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit",map_filename_path);

 

@@ -485,10 +468,8 @@ public class Navit extends Activity
 	public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {

 		switch (requestCode) {

 			case MY_PERMISSIONS_REQUEST_ALL: {

-				if (grantResults.length > 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED

-						&& grantResults[1] == PackageManager.PERMISSION_GRANTED) {

-						// ok, we got permissions

-				} else {

+				if (!(grantResults.length > 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED

+						&& grantResults[1] == PackageManager.PERMISSION_GRANTED)){

 					AlertDialog.Builder infobox = new AlertDialog.Builder(this);

 					infobox.setTitle(getString(R.string.permissions_info_box_title)); // TRANS

 					infobox.setCancelable(false);