cleanup

1 files changed, 30 insertions, 38 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitBackupTask.java b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
index 93d0c4c33..6330cd4d4 100644
--- a/navit/android/src/org/navitproject/navit/NavitBackupTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
@@ -1,3 +1,4 @@
+
 package org.navitproject.navit;
 
 import android.app.ProgressDialog;
@@ -17,7 +18,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
 
     private ProgressDialog mDialog;
 
-    public NavitBackupTask(Navit context) {
+    NavitBackupTask(Navit context) {
         mActivity = context;
     }
 
@@ -28,7 +29,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
         /* Create a Wait Progress Dialog to inform the User that we are working */
         mDialog = new ProgressDialog(mActivity);
         mDialog.setIndeterminate(true);
-        mDialog.setMessage(mActivity.getTstring(R.string.backing_up));
+        mDialog.setMessage(mActivity.getString(R.string.backing_up));
         mDialog.show();
     }
 
@@ -38,70 +39,63 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
         now.setToNow();
 
         /* This is the Directory where all Subdirectories are stored by date */
-        File mainBackupDir = new File(
-            Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
+        File mainBackupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
 
         /* Create the Main Backup Directory if it doesn't exist */
         if (!mainBackupDir.isDirectory()) {
-            if (!mainBackupDir.mkdirs()) {
-                return mActivity.getTstring(R.string.failed_to_create_backup_directory);
-            }
+            if (!mainBackupDir.mkdirs())
+                return mActivity.getString(R.string.failed_to_create_backup_directory);
         }
 
         /* Create a Timestamp in the format YYYY-MM-DD-Index */
-        String timestamp = now.year + "-" + String.format("%02d", now.month + 1) + "-" + String
-                           .format("%02d", now.monthDay);
+        String timestamp = now.year + "-" + String.format("%02d", now.month+1) + "-" + String.format("%02d", now.monthDay);
         /* Get the next free index */
         int index = 1;
         for (String s : mainBackupDir.list()) {
             if (s.contains(timestamp)) {
                 int newIndex = Integer.parseInt(s.substring(11));
-                if (newIndex >= index) {
+                if (newIndex >= index)
                     index = newIndex + 1;
-                }
             }
         }
         timestamp += "-" + index;
 
         /* This is the Directory in which the Files are copied into */
-        File backupDir = new File(
-            Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + timestamp);
+        File backupDir = new File(Environment.getExternalStorageDirectory().getPath()
+                + "/navit/backup/" + timestamp);
 
         /* Create the Backup Directory if it doesn't exist */
         if (!backupDir.isDirectory()) {
-            if (!backupDir.mkdirs()) {
-                return mActivity.getTstring(R.string.failed_to_create_backup_directory);
-            }
+            if (!backupDir.mkdirs())
+                return mActivity.getString(R.string.failed_to_create_backup_directory);
         }
 
         ObjectOutputStream preferencesOOs = null;
         try {
             /* Backup Files in home */
-            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt",
-                                       backupDir.getPath() + "/bookmark.txt");
-            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt",
-                                       backupDir.getPath() + "/destination.txt");
-            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt",
-                                       backupDir.getPath() + "/gui_internal.txt");
+            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt", backupDir.getPath() + "/bookmark.txt");
+            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt", backupDir.getPath() + "/destination.txt");
+            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt", backupDir.getPath() + "/gui_internal.txt");
 
             /* Backup Shared Preferences */
-            preferencesOOs = new ObjectOutputStream(
-                new FileOutputStream(backupDir.getPath() + "/preferences.bak"));
-            preferencesOOs.writeObject(
-                mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE)
-                .getAll());
-        } catch (IOException e) {
+            preferencesOOs = new ObjectOutputStream(new FileOutputStream
+                    (backupDir.getPath() + "/preferences.bak"));
+            preferencesOOs.writeObject(mActivity.getSharedPreferences
+                    (Navit.NAVIT_PREFS, Context.MODE_PRIVATE).getAll());
+        }
+        catch (IOException e) {
             e.printStackTrace();
-            return mActivity.getTstring(R.string.backup_failed);
-        } finally {
+            return mActivity.getString(R.string.backup_failed);
+        }
+        finally {
             /* Close Stream to prevent Resource Leaks */
             try {
-                if (preferencesOOs != null) {
+                if (preferencesOOs != null)
                     preferencesOOs.close();
-                }
-            } catch (IOException e) {
+            }
+            catch (IOException e) {
                 e.printStackTrace();
-                return mActivity.getTstring(R.string.backup_failed);
+                return mActivity.getString(R.string.backup_failed);
             }
         }
 
@@ -121,15 +115,13 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
             return;
         }
 
-        Toast.makeText(mActivity, mActivity.getTstring(R.string.backup_successful),
-                       Toast.LENGTH_LONG).show();
+        Toast.makeText(mActivity, mActivity.getString(R.string.backup_successful), Toast.LENGTH_LONG).show();
     }
 
     @Override
     protected void onCancelled() {
         super.onCancelled();
-        Toast.makeText(mActivity, mActivity.getTstring(R.string.backup_failed), Toast.LENGTH_LONG)
-        .show();
+        Toast.makeText(mActivity, mActivity.getString(R.string.backup_failed), Toast.LENGTH_LONG).show();
         mDialog.dismiss();
     }
 }