cleanup

1 files changed, 56 insertions, 60 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
index 862feac1e..8ee434ad1 100755
--- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java
+++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
@@ -11,64 +11,60 @@ import android.content.SharedPreferences;
 
 public class NavitAppConfig extends Application {
 
-	private static final int MAX_LAST_ADDRESSES = 10;
-	private List<NavitAddress> mLastAddresses     = null;
-	private int mLastAddressField;
-	private SharedPreferences mSettings;
-
-	@Override
-	public void onCreate() {
-		mSettings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
-		super.onCreate();
-	}
-
-	List<NavitAddress> getLastAddresses() {
-		if (mLastAddresses == null) {
-			mLastAddresses = new ArrayList<>();
-			int mLastAddressField = mSettings.getInt("LastAddress", -1);
-			if (mLastAddressField >= 0) {
-				int index = mLastAddressField;
-				do {
-					String addrStr = mSettings.getString("LastAddress_" + String.valueOf(index), "");
-
-					if (addrStr.length() > 0) {
-						mLastAddresses.add(new NavitAddress(
-						        1,
-						        mSettings.getFloat("LastAddress_Lat_" + String.valueOf(index), 0),
-						        mSettings.getFloat("LastAddress_Lon_" + String.valueOf(index), 0),
-						        addrStr));
-					}
-
-					if (--index < 0) {
-					    index = MAX_LAST_ADDRESSES - 1;
-					}
-
-				} while (index != mLastAddressField);
-			}
-		}
-		return mLastAddresses;
-	}
-
-	void addLastAddress(NavitAddress newAddress) {
-		getLastAddresses();
-
-		mLastAddresses.add(newAddress);
-		if (mLastAddresses.size() > MAX_LAST_ADDRESSES) {
-		    mLastAddresses.remove(0);
-		}
-
-		mLastAddressField++;
-		if (mLastAddressField >= MAX_LAST_ADDRESSES) {
-		    mLastAddressField = 0;
-		}
-
-		SharedPreferences.Editor editSettings = mSettings.edit();
-
-		editSettings.putInt("LastAddress", mLastAddressField);
-		editSettings.putString("LastAddress_" + String.valueOf(mLastAddressField), newAddress.addr);
-		editSettings.putFloat("LastAddress_Lat_" + String.valueOf(mLastAddressField), newAddress.lat);
-		editSettings.putFloat("LastAddress_Lon_" + String.valueOf(mLastAddressField), newAddress.lon);
-
-		editSettings.apply();
-	}
+    private static final int MAX_LAST_ADDRESSES = 10;
+    private List<NavitAddress> mLastAddresses;
+    private int mLastAddressField;
+    private SharedPreferences mSettings;
+
+    @Override
+    public void onCreate() {
+        mSettings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
+        super.onCreate();
+    }
+
+    List<NavitAddress> getLastAddresses() {
+        if (mLastAddresses == null) {
+            mLastAddresses = new ArrayList<>();
+            int mLastAddressField = mSettings.getInt("LastAddress", -1);
+            if (mLastAddressField >= 0) {
+                int index = mLastAddressField;
+                do {
+                    String addrStr = mSettings.getString("LastAddress_" + String.valueOf(index), "");
+                    if (addrStr.length() > 0) {
+                        mLastAddresses.add(new NavitAddress(1,
+                                mSettings.getFloat("LastAddress_Lat_" + String.valueOf(index), 0),
+                                mSettings.getFloat("LastAddress_Lon_" + String.valueOf(index), 0),
+                                addrStr));
+                    }
+                    if (--index < 0) {
+                        index = MAX_LAST_ADDRESSES - 1;
+                    }
+                } while (index != mLastAddressField);
+            }
+        }
+        return mLastAddresses;
+    }
+
+    void addLastAddress(NavitAddress newAddress) {
+        getLastAddresses();
+
+        mLastAddresses.add(newAddress);
+        if (mLastAddresses.size() > MAX_LAST_ADDRESSES) {
+            mLastAddresses.remove(0);
+        }
+
+        mLastAddressField++;
+        if (mLastAddressField >= MAX_LAST_ADDRESSES) {
+            mLastAddressField = 0;
+        }
+
+        SharedPreferences.Editor editSettings = mSettings.edit();
+
+        editSettings.putInt("LastAddress", mLastAddressField);
+        editSettings.putString("LastAddress_" + String.valueOf(mLastAddressField), newAddress.addr);
+        editSettings.putFloat("LastAddress_Lat_" + String.valueOf(mLastAddressField), newAddress.lat);
+        editSettings.putFloat("LastAddress_Lon_" + String.valueOf(mLastAddressField), newAddress.lon);
+
+        editSettings.apply();
+    }
 }