diff options
author | jandegr <jandegr@users.noreply.github.com> | 2018-04-30 17:27:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-30 17:27:12 +0200 |
commit | 8d997b7e72ddeb281c1342ab77aa8690c04e330e (patch) | |
tree | 6c9f4dc649de986244f80fc4da87526bf1955828 | |
parent | 9f0cc410dca682441d8e50602e64ee703b6cac4f (diff) | |
download | navit-refactor_android.tar.gz |
refactoringrefactor_android
4 files changed, 9 insertions, 12 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java index 1a1a61f94..244cef9ce 100755 --- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java +++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java @@ -7,7 +7,6 @@ import org.navitproject.navit.NavitAddressSearchActivity.NavitAddress; import android.app.Application;
import android.content.SharedPreferences;
-import android.util.Log;
public class NavitAppConfig extends Application {
@@ -66,6 +65,6 @@ public class NavitAppConfig extends Application { editSettings.putFloat("LastAddress_Lat_" + String.valueOf(mLastAddressField), newAddress.lat);
editSettings.putFloat("LastAddress_Lon_" + String.valueOf(mLastAddressField), newAddress.lon);
- editSettings.commit();
+ editSettings.apply();
}
}
diff --git a/navit/android/src/org/navitproject/navit/NavitMap.java b/navit/android/src/org/navitproject/navit/NavitMap.java index b7bd265a4..274cbdd8b 100644 --- a/navit/android/src/org/navitproject/navit/NavitMap.java +++ b/navit/android/src/org/navitproject/navit/NavitMap.java @@ -3,11 +3,11 @@ package org.navitproject.navit; import java.io.File; public class NavitMap { - String fileName; + private String fileName; String mapName; - String mapPath; + private String mapPath; - public NavitMap(String path, String map_file_name) { + NavitMap(String path, String map_file_name) { mapPath = path; fileName = map_file_name; if (map_file_name.endsWith(".bin")) { @@ -17,7 +17,7 @@ public class NavitMap { } } - public NavitMap(String map_location) { + NavitMap(String map_location) { File mapFile = new File(map_location); mapPath = mapFile.getParent() + "/"; diff --git a/navit/android/src/org/navitproject/navit/NavitSpeech2.java b/navit/android/src/org/navitproject/navit/NavitSpeech2.java index b4ec85d4e..77b79c3c2 100644 --- a/navit/android/src/org/navitproject/navit/NavitSpeech2.java +++ b/navit/android/src/org/navitproject/navit/NavitSpeech2.java @@ -20,7 +20,6 @@ package org.navitproject.navit; import android.content.Intent; -import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; import android.app.AlertDialog; @@ -31,17 +30,17 @@ import android.util.Log; public class NavitSpeech2 implements TextToSpeech.OnInitListener, NavitActivityResult { private TextToSpeech mTts; private Navit navit; - int MY_DATA_CHECK_CODE=1; + private int MY_DATA_CHECK_CODE=1; public void onInit(int status) { - Log.e("NavitSpeech2","Status "+status); + Log.d("NavitSpeech2","Status "+status); } public void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.e("NavitSpeech2","onActivityResult "+requestCode+" "+resultCode); + Log.d("NavitSpeech2","onActivityResult "+requestCode+" "+resultCode); if (requestCode == MY_DATA_CHECK_CODE) { if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) { // success, create the TTS instance diff --git a/navit/android/src/org/navitproject/navit/NavitVehicle.java b/navit/android/src/org/navitproject/navit/NavitVehicle.java index e1a9c70f1..583d044c1 100644 --- a/navit/android/src/org/navitproject/navit/NavitVehicle.java +++ b/navit/android/src/org/navitproject/navit/NavitVehicle.java @@ -20,7 +20,6 @@ package org.navitproject.navit; import java.util.List; -import android.Manifest; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -40,7 +39,7 @@ import android.support.v4.content.ContextCompat; public class NavitVehicle { - public static final String GPS_FIX_CHANGE = "android.location.GPS_FIX_CHANGE"; + private static final String GPS_FIX_CHANGE = "android.location.GPS_FIX_CHANGE"; public static Location lastLocation = null; |