From cb0052f842e5d5f5d672a90a1ef8dc5853e10212 Mon Sep 17 00:00:00 2001
From: rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sat, 28 Apr 2012 22:54:23 +0000
Subject: [PATCH] Fix:Android:Silence some debug messages to improve startup
 time

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5054 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/navit/android/src/org/navitproject/navit/Navit.java        | 9 ++-------
 navit/navit/android/src/org/navitproject/navit/NavitDialogs.java | 1 -
 .../src/org/navitproject/navit/NavitTextTranslations.java        | 5 ++---
 navit/navit/support/wordexp/glob.c                               | 6 +++---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index db2b2f3..61c42ed 100644
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -358,17 +358,12 @@ public class Navit extends Activity
 		// --> dont use android.os.Build.VERSION.SDK_INT, needs API >= 4
 		Log.e("Navit", "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");
-		
+
 		activateAllMaps();
-		
+
 		showInfos();
 
 		Navit.mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-		// unpack some localized Strings
-		// a test now, later we will unpack all needed string for java, here at this point!!
-		String x = NavitGraphics.getLocalizedString("Austria");
-		Log.e("Navit", "x=" + x);
 	}
 
 	private void activateAllMaps()
diff --git a/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java b/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
index a6a6967..ee91d5d 100644
--- a/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
@@ -1,7 +1,6 @@
 package org.navitproject.navit;
 
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
diff --git a/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java b/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
index 738b6f0..98c6462 100644
--- a/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
@@ -208,9 +208,8 @@ public class NavitTextTranslations
 
 	private static void p(String key, String[] values)
 	{
-		HashMap<String, String> t = null;
-		t = new HashMap<String, String>();
-		Log.e("NavitTextTranslations", "trying: " + key);
+		HashMap<String, String> t = new HashMap<String, String>();
+		//Log.e("NavitTextTranslations", "trying: " + key);
 		try
 		{
 			for (int i = 0; i < (int) (values.length / 2); i++)
diff --git a/navit/navit/support/wordexp/glob.c b/navit/navit/support/wordexp/glob.c
index 6cbf5e5..222504c 100644
--- a/navit/navit/support/wordexp/glob.c
+++ b/navit/navit/support/wordexp/glob.c
@@ -131,7 +131,7 @@ glob_recursive(const char *path1, const char *path2, const char *pattern, int fl
 		strcat(path, "/");
 	strcat(path, path2);
 	if (!strlen(pattern)) {
-		dbg(0,"found %s\n",path);
+		dbg(1,"found %s\n",path);
 		pglob->gl_pathv=realloc(pglob->gl_pathv, (pglob->gl_pathc+1)*sizeof(char *));
 		if (!pglob->gl_pathv) {
 			pglob->gl_pathc=0;
@@ -140,7 +140,7 @@ glob_recursive(const char *path1, const char *path2, const char *pattern, int fl
 		pglob->gl_pathv[pglob->gl_pathc++]=path;
 		return 0;
 	}
-	dbg(0,"searching for %s in %s\n",pattern,path);
+	dbg(1,"searching for %s in %s\n",pattern,path);
 	flen=strcspn(pattern,"/");
 	next=pattern+flen;
 	if (*next == '/')
@@ -151,7 +151,7 @@ glob_recursive(const char *path1, const char *path2, const char *pattern, int fl
 	if (glob_requires_match(fname, 0)) {
 		DIR *dh;
 		struct dirent *de;
-		dbg(0,"in dir %s search for %s\n",path,fname);
+		dbg(1,"in dir %s search for %s\n",path,fname);
 		dh=opendir(path);
 		if (dh) {
 			while ((de=readdir(dh))) {
-- 
2.7.4