Convert files to Unix format

4 files changed, 222 insertions, 222 deletions

diff --git a/main/src/cgeo/geocaching/GpxFileListActivity.java b/main/src/cgeo/geocaching/GpxFileListActivity.java
index dae52c4..3da4927 100644
--- a/main/src/cgeo/geocaching/GpxFileListActivity.java
+++ b/main/src/cgeo/geocaching/GpxFileListActivity.java
@@ -1,63 +1,63 @@
-package cgeo.geocaching;

-

-import cgeo.geocaching.connector.ConnectorFactory;

-import cgeo.geocaching.connector.IConnector;

-import cgeo.geocaching.files.AbstractFileListActivity;

-import cgeo.geocaching.files.GPXImporter;

-import cgeo.geocaching.list.StoredList;

-import cgeo.geocaching.settings.Settings;

-import cgeo.geocaching.ui.GPXListAdapter;

-

-import org.apache.commons.lang3.StringUtils;

-

-import android.app.Activity;

-import android.content.Intent;

-

-import java.io.File;

-import java.util.Collections;

-import java.util.List;

-

-public class GpxFileListActivity extends AbstractFileListActivity<GPXListAdapter> {

-

-    public GpxFileListActivity() {

-        super(new String[] { "gpx", "loc", "zip" });

-    }

-

-    @Override

-    protected GPXListAdapter getAdapter(List<File> files) {

-        return new GPXListAdapter(this, files);

-    }

-

-    @Override

-    protected List<File> getBaseFolders() {

-        return Collections.singletonList(new File(Settings.getGpxImportDir()));

-    }

-

-    public static void startSubActivity(Activity fromActivity, int listId) {

-        final Intent intent = new Intent(fromActivity, GpxFileListActivity.class);

-        intent.putExtra(Intents.EXTRA_LIST_ID, StoredList.getConcreteList(listId));

-        fromActivity.startActivityForResult(intent, 0);

-    }

-

-    @Override

-    protected boolean filenameBelongsToList(final String filename) {

-        if (super.filenameBelongsToList(filename)) {

-            if (StringUtils.endsWithIgnoreCase(filename, GPXImporter.ZIP_FILE_EXTENSION)) {

-                for (IConnector connector : ConnectorFactory.getConnectors()) {

-                    if (connector.isZippedGPXFile(filename)) {

-                        return true;

-                    }

-                }

-                return false;

-            }

-            // filter out waypoint files

-            return !StringUtils.containsIgnoreCase(filename, GPXImporter.WAYPOINTS_FILE_SUFFIX);

-        }

-        return false;

-    }

-

-    public int getListId() {

-        return listId;

-    }

-

-}

+package cgeo.geocaching;
+
+import cgeo.geocaching.connector.ConnectorFactory;
+import cgeo.geocaching.connector.IConnector;
+import cgeo.geocaching.files.AbstractFileListActivity;
+import cgeo.geocaching.files.GPXImporter;
+import cgeo.geocaching.list.StoredList;
+import cgeo.geocaching.settings.Settings;
+import cgeo.geocaching.ui.GPXListAdapter;
+
+import org.apache.commons.lang3.StringUtils;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+public class GpxFileListActivity extends AbstractFileListActivity<GPXListAdapter> {
+
+    public GpxFileListActivity() {
+        super(new String[] { "gpx", "loc", "zip" });
+    }
+
+    @Override
+    protected GPXListAdapter getAdapter(List<File> files) {
+        return new GPXListAdapter(this, files);
+    }
+
+    @Override
+    protected List<File> getBaseFolders() {
+        return Collections.singletonList(new File(Settings.getGpxImportDir()));
+    }
+
+    public static void startSubActivity(Activity fromActivity, int listId) {
+        final Intent intent = new Intent(fromActivity, GpxFileListActivity.class);
+        intent.putExtra(Intents.EXTRA_LIST_ID, StoredList.getConcreteList(listId));
+        fromActivity.startActivityForResult(intent, 0);
+    }
+
+    @Override
+    protected boolean filenameBelongsToList(final String filename) {
+        if (super.filenameBelongsToList(filename)) {
+            if (StringUtils.endsWithIgnoreCase(filename, GPXImporter.ZIP_FILE_EXTENSION)) {
+                for (IConnector connector : ConnectorFactory.getConnectors()) {
+                    if (connector.isZippedGPXFile(filename)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            // filter out waypoint files
+            return !StringUtils.containsIgnoreCase(filename, GPXImporter.WAYPOINTS_FILE_SUFFIX);
+        }
+        return false;
+    }
+
+    public int getListId() {
+        return listId;
+    }
+
+}
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java b/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java
index ac83085..5012195 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java
@@ -1,26 +1,26 @@
-package cgeo.geocaching.apps.cache.navi;

-

-import cgeo.geocaching.R;

-import cgeo.geocaching.geopoint.Geopoint;

-

-import android.content.Intent;

-

-/**

- * Application for communication with the Pebble watch.

- *

- */

-class PebbleApp extends AbstractRadarApp {

-

-    private static final String INTENT = "com.webmajstr.pebble_gc.NAVIGATE_TO";

-    private static final String PACKAGE_NAME = "com.webmajstr.pebble_gc";

-

-    PebbleApp() {

-        super(getString(R.string.cache_menu_pebble), R.id.cache_app_pebble, INTENT, PACKAGE_NAME);

-    }

-

-    @Override

-    protected void addCoordinates(final Intent intent, final Geopoint coords) {

-        intent.putExtra("latitude", coords.getLatitude());

-        intent.putExtra("longitude", coords.getLongitude());

-    }

+package cgeo.geocaching.apps.cache.navi;
+
+import cgeo.geocaching.R;
+import cgeo.geocaching.geopoint.Geopoint;
+
+import android.content.Intent;
+
+/**
+ * Application for communication with the Pebble watch.
+ *
+ */
+class PebbleApp extends AbstractRadarApp {
+
+    private static final String INTENT = "com.webmajstr.pebble_gc.NAVIGATE_TO";
+    private static final String PACKAGE_NAME = "com.webmajstr.pebble_gc";
+
+    PebbleApp() {
+        super(getString(R.string.cache_menu_pebble), R.id.cache_app_pebble, INTENT, PACKAGE_NAME);
+    }
+
+    @Override
+    protected void addCoordinates(final Intent intent, final Geopoint coords) {
+        intent.putExtra("latitude", coords.getLatitude());
+        intent.putExtra("longitude", coords.getLongitude());
+    }
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/files/InvalidXMLCharacterFilterReader.java b/main/src/cgeo/geocaching/files/InvalidXMLCharacterFilterReader.java
index a7a3e1b..e1f000c 100644
--- a/main/src/cgeo/geocaching/files/InvalidXMLCharacterFilterReader.java
+++ b/main/src/cgeo/geocaching/files/InvalidXMLCharacterFilterReader.java
@@ -1,98 +1,98 @@
-package cgeo.geocaching.files;

-

-import org.apache.commons.lang3.StringUtils;

-

-import java.io.FilterReader;

-import java.io.IOException;

-import java.io.Reader;

-

-/**

- * Filter reader which can filter out invalid XML characters and character references.

- *

- */

-public class InvalidXMLCharacterFilterReader extends FilterReader

-{

-

-    public InvalidXMLCharacterFilterReader(Reader in) {

-        super(in);

-    }

-

-    /**

-     * Every overload of {@link Reader#read()} method delegates to this one so

-     * it is enough to override only this one. <br />

-     * To skip invalid characters this method shifts only valid chars to left

-     * and returns decreased value of the original read method. So after last

-     * valid character there will be some unused chars in the buffer.

-     *

-     * @return Number of read valid characters or <code>-1</code> if end of the

-     *         underling reader was reached.

-     */

-    @Override

-    public int read(char[] cbuf, int off, int len) throws IOException {

-        int read = super.read(cbuf, off, len);

-        // check for end

-        if (read == -1) {

-            return -1;

-        }

-        // target position

-        int pos = off - 1;

-

-        int entityStart = -1;

-        for (int readPos = off; readPos < off + read; readPos++) {

-            boolean useChar = true;

-            switch (cbuf[readPos]) {

-                case '&':

-                    pos++;

-                    entityStart = readPos;

-                    break;

-                case ';':

-                    pos++;

-                    if (entityStart >= 0) {

-                        int entityLength = readPos - entityStart + 1;

-                        if (entityLength <= 5) {

-                            String entity = new String(cbuf, entityStart, entityLength);

-                            if (StringUtils.startsWith(entity, "&#")) {

-                                String numberString = StringUtils.substringBetween(entity, "&#", ";");

-                                final int value;

-                                if (StringUtils.startsWith(numberString, "x")) {

-                                    value = Integer.parseInt(numberString.substring(1), 16);

-                                }

-                                else {

-                                    value = Integer.parseInt(numberString);

-                                }

-                                if (!isValidXMLChar((char) value)) {

-                                    pos -= entityLength;

-                                    useChar = false;

-                                }

-                            }

-                        }

-                    }

-                    break;

-                default:

-                    if (isValidXMLChar(cbuf[readPos])) {

-                        pos++;

-                    } else {

-                        continue;

-                    }

-            }

-            // copy, and skip unwanted characters

-            if (pos < readPos && useChar) {

-                cbuf[pos] = cbuf[readPos];

-            }

-        }

-        return pos - off + 1;

-    }

-

-    private static boolean isValidXMLChar(char c) {

-        if ((c == 0x9) ||

-                (c == 0xA) ||

-                (c == 0xD) ||

-                ((c >= 0x20) && (c <= 0xD7FF)) ||

-                ((c >= 0xE000) && (c <= 0xFFFD)) ||

-                ((c >= 0x10000) && (c <= 0x10FFFF)))

-        {

-            return true;

-        }

-        return false;

-    }

+package cgeo.geocaching.files;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.FilterReader;
+import java.io.IOException;
+import java.io.Reader;
+
+/**
+ * Filter reader which can filter out invalid XML characters and character references.
+ *
+ */
+public class InvalidXMLCharacterFilterReader extends FilterReader
+{
+
+    public InvalidXMLCharacterFilterReader(Reader in) {
+        super(in);
+    }
+
+    /**
+     * Every overload of {@link Reader#read()} method delegates to this one so
+     * it is enough to override only this one. <br />
+     * To skip invalid characters this method shifts only valid chars to left
+     * and returns decreased value of the original read method. So after last
+     * valid character there will be some unused chars in the buffer.
+     *
+     * @return Number of read valid characters or <code>-1</code> if end of the
+     *         underling reader was reached.
+     */
+    @Override
+    public int read(char[] cbuf, int off, int len) throws IOException {
+        int read = super.read(cbuf, off, len);
+        // check for end
+        if (read == -1) {
+            return -1;
+        }
+        // target position
+        int pos = off - 1;
+
+        int entityStart = -1;
+        for (int readPos = off; readPos < off + read; readPos++) {
+            boolean useChar = true;
+            switch (cbuf[readPos]) {
+                case '&':
+                    pos++;
+                    entityStart = readPos;
+                    break;
+                case ';':
+                    pos++;
+                    if (entityStart >= 0) {
+                        int entityLength = readPos - entityStart + 1;
+                        if (entityLength <= 5) {
+                            String entity = new String(cbuf, entityStart, entityLength);
+                            if (StringUtils.startsWith(entity, "&#")) {
+                                String numberString = StringUtils.substringBetween(entity, "&#", ";");
+                                final int value;
+                                if (StringUtils.startsWith(numberString, "x")) {
+                                    value = Integer.parseInt(numberString.substring(1), 16);
+                                }
+                                else {
+                                    value = Integer.parseInt(numberString);
+                                }
+                                if (!isValidXMLChar((char) value)) {
+                                    pos -= entityLength;
+                                    useChar = false;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                default:
+                    if (isValidXMLChar(cbuf[readPos])) {
+                        pos++;
+                    } else {
+                        continue;
+                    }
+            }
+            // copy, and skip unwanted characters
+            if (pos < readPos && useChar) {
+                cbuf[pos] = cbuf[readPos];
+            }
+        }
+        return pos - off + 1;
+    }
+
+    private static boolean isValidXMLChar(char c) {
+        if ((c == 0x9) ||
+                (c == 0xA) ||
+                (c == 0xD) ||
+                ((c >= 0x20) && (c <= 0xD7FF)) ||
+                ((c >= 0xE000) && (c <= 0xFFFD)) ||
+                ((c >= 0x10000) && (c <= 0x10FFFF)))
+        {
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java b/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java
index 6e91239..3af950f 100644
--- a/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java
+++ b/main/src/cgeo/geocaching/ui/DecryptTextClickListener.java
@@ -1,37 +1,37 @@
-package cgeo.geocaching.ui;

-

-import cgeo.geocaching.utils.CryptUtils;

-

-import org.eclipse.jdt.annotation.NonNull;

-

-import android.text.Spannable;

-import android.view.View;

-import android.widget.TextView;

-

-public class DecryptTextClickListener implements View.OnClickListener {

-

-    @NonNull private final TextView targetView;

-

-    public DecryptTextClickListener(@NonNull final TextView targetView) {

-        this.targetView = targetView;

-    }

-

-    @Override

-    public final void onClick(final View view) {

-        try {

-            // do not run the click listener if a link was clicked

-            if (targetView.getSelectionStart() != -1 || targetView.getSelectionEnd() != -1) {

-                return;

-            }

-

-            CharSequence text = targetView.getText();

-            if (text instanceof Spannable) {

-                targetView.setText(CryptUtils.rot13((Spannable) text));

-            } else {

-                targetView.setText(CryptUtils.rot13((String) text));

-            }

-        } catch (final RuntimeException ignore) {

-            // nothing

-        }

-    }

-}

+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.utils.CryptUtils;
+
+import org.eclipse.jdt.annotation.NonNull;
+
+import android.text.Spannable;
+import android.view.View;
+import android.widget.TextView;
+
+public class DecryptTextClickListener implements View.OnClickListener {
+
+    @NonNull private final TextView targetView;
+
+    public DecryptTextClickListener(@NonNull final TextView targetView) {
+        this.targetView = targetView;
+    }
+
+    @Override
+    public final void onClick(final View view) {
+        try {
+            // do not run the click listener if a link was clicked
+            if (targetView.getSelectionStart() != -1 || targetView.getSelectionEnd() != -1) {
+                return;
+            }
+
+            CharSequence text = targetView.getText();
+            if (text instanceof Spannable) {
+                targetView.setText(CryptUtils.rot13((Spannable) text));
+            } else {
+                targetView.setText(CryptUtils.rot13((String) text));
+            }
+        } catch (final RuntimeException ignore) {
+            // nothing
+        }
+    }
+}