Date: Wed Nov 9 20:17:38 2016 +0100
Blame Urllib problems on the callers
For Crashlytics.
The previous attempt at doing this failed, because it tried to modify
the *first* exception in the chain, but it turns out that it's the
*last* exception in the chain that Crashlytics looks at.
So given an Exception...
"
java.lang.Exception: This is a test Exception
at not.bankdroid.at.all.ExceptionFactory.getException(ExceptionFactory.java:20)
at com.liato.bankdroid.utils.ExceptionUtilsTest.testBlameBankdroid(ExceptionUtilsTest.java:16)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at ...
"
... we now report to Crashlytics:
"
java.lang.Exception: This is a test Exception
at not.bankdroid.at.all.ExceptionFactory.getException(ExceptionFactory.java:20)
at com.liato.bankdroid.utils.ExceptionUtilsTest.testBlameBankdroid(ExceptionUtilsTest.java:16)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at ...
Caused by: java.lang.Exception: This is a test Exception
at com.liato.bankdroid.utils.ExceptionUtilsTest.testBlameBankdroid(ExceptionUtilsTest.java:16)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at ...
... 37 more
"
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
index 468b56e..91fe4d5 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
@@ -1,6 +1,8 @@
package com.liato.bankdroid.utils;
+import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
@@ -11,41 +13,109 @@ public class ExceptionUtils {
private static final String PREFIX = "com.liato.bankdroid.";
/**
- * Take an exception thrown and make it look like it came from Bankdroid.
+ * Modify an Exception to make it look like it was ultimately caused by Bankdroid.
*
- * Specifically, if Urllib.java, called by Bankdroid code, throws an exception,
- * rewrite the exception so that it appears as if it was thrown from the
- * Bankdroid method calling Urllib, but caused by the original Exception.
+ * The purpose is to make Crashlytics report Urllib exceptions as coming from whatever
+ * bank Urllib is trying to access.
+ *
+ * For example, this exception:
+ *
+ * java.lang.Exception: This is a test Exception
+ * at not.bankdroid.at.all.ExceptionFactory.getException(ExceptionFactory.java:20)
+ * at com.liato.bankdroid.utils.ExceptionUtilsTest.testBlameBankdroid(ExceptionUtilsTest.java:16)
+ * at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ * at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+ * at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ * at java.lang.reflect.Method.invoke(Method.java:497)
+ * at ...
+ *
+ *
+ * Would be turned into this exception:
+ *
+ * java.lang.Exception: This is a test Exception
+ * at not.bankdroid.at.all.ExceptionFactory.getException(ExceptionFactory.java:20)
+ * at com.liato.bankdroid.utils.ExceptionUtilsTest.testBlameBankdroid(ExceptionUtilsTest.java:16)
+ * at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ * at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+ * at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ * at java.lang.reflect.Method.invoke(Method.java:497)
+ * at ...
+ * Caused by: java.lang.Exception: This is a test Exception
+ * at com.liato.bankdroid.utils.ExceptionUtilsTest.testBlameBankdroid(ExceptionUtilsTest.java:16)
+ * at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ * at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+ * at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ * at java.lang.reflect.Method.invoke(Method.java:497)
+ * at ...
+ * ... 37 more
+ *
*/
- public static T bankdroidifyException(T exception) {
+ public static void blameBankdroid(Throwable exception) {
+ Throwable ultimateCause = getUltimateCause(exception);
+ if (ultimateCause == null) {
+ // Unable to find ultimate cause, never mind
+ return;
+ }
+
StackTraceElement[] bankdroidifiedStacktrace =
- bankdroidifyStacktrace(exception.getStackTrace());
- if (bankdroidifiedStacktrace.length == exception.getStackTrace().length) {
- // Unable to bankdroidify stacktrace, never mind
- return exception;
+ bankdroidifyStacktrace(ultimateCause.getStackTrace());
+ if (bankdroidifiedStacktrace.length == 0) {
+ // No Bankdroid stack frames found, never mind
+ return;
+ }
+ if (bankdroidifiedStacktrace.length == ultimateCause.getStackTrace().length) {
+ // Bankdroid already to blame, never mind
+ return;
}
- T returnMe = createWrapperException(exception);
- if (returnMe == null) {
+ Throwable fakeCause = cloneException(ultimateCause);
+ if (fakeCause == null) {
Timber.w(new RuntimeException(
- "Unable to bankdroidify exception of class: " + exception.getClass()));
- return exception;
+ "Unable to bankdroidify exception of class: " + ultimateCause.getClass()));
+ return;
}
- returnMe.initCause(exception);
+ // Put the bankdroidified stack trace before the fakeCause's actual stack trace
+ fakeCause.setStackTrace(concatArrays(bankdroidifiedStacktrace, fakeCause.getStackTrace()));
- returnMe.setStackTrace(bankdroidifiedStacktrace);
+ ultimateCause.initCause(fakeCause);
+ }
+ @VisibleForTesting
+ static StackTraceElement[] concatArrays(StackTraceElement[] a, StackTraceElement[] b) {
+ StackTraceElement[] returnMe = new StackTraceElement[a.length + b.length];
+ System.arraycopy(a, 0, returnMe, 0, a.length);
+ System.arraycopy(b, 0, returnMe, a.length, b.length);
return returnMe;
}
+ @VisibleForTesting
+ @Nullable
+ static Throwable getUltimateCause(Throwable t) {
+ int laps = 0;
+ Throwable ultimateCause = t;
+ while (ultimateCause.getCause() != null) {
+ ultimateCause = ultimateCause.getCause();
+ if (laps++ > 10) {
+ return null;
+ }
+ }
+ return ultimateCause;
+ }
+
+ /**
+ * Clone message and stacktrace but not the cause.
+ */
@Nullable
- private static T createWrapperException(T wrapMe) {
+ @VisibleForTesting
+ static T cloneException(T wrapMe) {
Class newClass = wrapMe.getClass();
while (newClass != null) {
try {
- return (T) newClass.getConstructor(String.class)
- .newInstance(wrapMe.getMessage());
+ T returnMe =
+ (T) newClass.getConstructor(String.class).newInstance(wrapMe.getMessage());
+ returnMe.setStackTrace(wrapMe.getStackTrace());
+ return returnMe;
} catch (InvocationTargetException e) {
newClass = newClass.getSuperclass();
} catch (NoSuchMethodException e) {
@@ -63,9 +133,12 @@ public class ExceptionUtils {
/**
* Remove all initial non-Bankdroid frames from a stack.
*
- * @return A copy of rawStack but with the initial non-Bankdroid frames removed
+ * @return A copy of rawStack but with the initial non-Bankdroid frames removed, or null
+ * if no sensible answer can be given.
*/
- private static StackTraceElement[] bankdroidifyStacktrace(final StackTraceElement[] rawStack) {
+ @VisibleForTesting
+ @NonNull
+ static StackTraceElement[] bankdroidifyStacktrace(final StackTraceElement[] rawStack) {
for (int i = 0; i < rawStack.length; i++) {
StackTraceElement stackTraceElement = rawStack[i];
if (stackTraceElement.getClassName().startsWith(PREFIX)) {
@@ -74,6 +147,6 @@ public class ExceptionUtils {
}
// No Bankdroid stack frames found, never mind
- return rawStack;
+ return new StackTraceElement[0];
}
}
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
index 36354b6..c064d9c 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
@@ -149,7 +149,8 @@ public class Urllib {
try {
return this.open(url, new ArrayList());
} catch (IOException e) {
- throw ExceptionUtils.bankdroidifyException(e);
+ ExceptionUtils.blameBankdroid(e);
+ throw e;
}
}
@@ -162,7 +163,8 @@ public class Urllib {
try {
return open(url, postData, false);
} catch (IOException e) {
- throw ExceptionUtils.bankdroidifyException(e);
+ ExceptionUtils.blameBankdroid(e);
+ throw e;
}
}
@@ -182,7 +184,8 @@ public class Urllib {
try {
return openAsHttpResponse(url, entity, forcePost);
} catch (IOException e) {
- throw ExceptionUtils.bankdroidifyException(e);
+ ExceptionUtils.blameBankdroid(e);
+ throw e;
}
}
@@ -200,7 +203,8 @@ public class Urllib {
return openAsHttpResponse(url, entity, HttpMethod.POST);
}
} catch (IOException e) {
- throw ExceptionUtils.bankdroidifyException(e);
+ ExceptionUtils.blameBankdroid(e);
+ throw e;
}
}
@@ -293,7 +297,8 @@ public class Urllib {
return openStream(url, postData != null ? new StringEntity(postData, this.charset) : null,
forcePost);
} catch (IOException e) {
- throw ExceptionUtils.bankdroidifyException(e);
+ ExceptionUtils.blameBankdroid(e);
+ throw e;
}
}
diff --git bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
index df673c5..2b87a96 100644
--- bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
+++ bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
@@ -3,85 +3,162 @@ package com.liato.bankdroid.utils;
import org.junit.Assert;
import org.junit.Test;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.net.ConnectException;
import eu.nullbyte.android.urllib.Urllib;
-import not.bankdroid.at.all.ExceptionThrower;
+import not.bankdroid.at.all.ExceptionFactory;
-@SuppressWarnings("CallToPrintStackTrace")
public class ExceptionUtilsTest {
@Test
- @SuppressWarnings({"PMD.AvoidPrintStackTrace", "PMD.AvoidCatchingNPE", "PMD.SystemPrintln"})
- public void testBankdroidifyException() throws Exception {
- Exception raw = null;
- try {
- //noinspection ConstantConditions
- new Urllib(null);
- Assert.fail("Exception expected");
- } catch (NullPointerException e) {
- raw = e;
+ public void testBlameBankdroid() {
+ Exception e = ExceptionFactory.getException();
+ String before = toStringWithStacktrace(e);
+ ExceptionUtils.blameBankdroid(e);
+ String after = toStringWithStacktrace(e);
+ String description =
+ String.format("\n---- Before ----\n%s---- After ----\n%s----", before, after);
+
+ String[] afterLines = after.split("\n");
+ int lastCausedByIndex = 0;
+ for (int i = 0; i < afterLines.length; i++) {
+ if (afterLines[i].startsWith("Caused by: ")) {
+ lastCausedByIndex = i;
+ }
}
- // Print stack traces, useful if the tests fail
- System.err.println("Before:");
- raw.printStackTrace();
+ Assert.assertNotEquals(description, 0, lastCausedByIndex);
+ Assert.assertTrue(description,
+ afterLines[lastCausedByIndex + 1].startsWith("\tat com.liato.bankdroid."));
+ }
- System.err.println();
- System.err.println("After:");
- Exception bankdroidified = ExceptionUtils.bankdroidifyException(raw);
- bankdroidified.printStackTrace();
+ /**
+ * Like {@link #testBlameBankdroid()} but with an Exception with a cause.
+ */
+ @Test
+ public void testBlameBankdroidWithCause() {
+ Exception e = ExceptionFactory.getExceptionWithCause();
+ String before = toStringWithStacktrace(e);
+ ExceptionUtils.blameBankdroid(e);
+ String after = toStringWithStacktrace(e);
+ String description =
+ String.format("\n---- Before ----\n%s---- After ----\n%s----", before, after);
+
+ String[] afterLines = after.split("\n");
+ int firstCausedByIndex = 0;
+ for (int i = 0; i < afterLines.length; i++) {
+ if (afterLines[i].startsWith("Caused by: ")) {
+ firstCausedByIndex = i;
+ break;
+ }
+ }
+ Assert.assertNotEquals(description, 0, firstCausedByIndex);
+ Assert.assertTrue(description,
+ afterLines[firstCausedByIndex + 1].startsWith("\tat not.bankdroid.at.all."));
+
+ int lastCausedByIndex = 0;
+ for (int i = 0; i < afterLines.length; i++) {
+ if (afterLines[i].startsWith("Caused by: ")) {
+ lastCausedByIndex = i;
+ }
+ }
+ Assert.assertNotEquals(description, 0, lastCausedByIndex);
+ Assert.assertTrue(description,
+ afterLines[lastCausedByIndex + 1].startsWith("\tat com.liato.bankdroid."));
+ }
- Assert.assertFalse("Test setup: Top frame of initial exception shouldn't be in Bankdroid",
- raw.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+ @Test
+ public void testBlameBankdroidAlreadyToBlame() {
+ // Creating it here we're already inside of Bankdroid code, blaming bankdroid should be a
+ // no-op
+ Exception e = new Exception();
- Assert.assertTrue("Top frame of bankdroidified exception should be in Bankdroid",
- bankdroidified.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+ String before = toStringWithStacktrace(e);
- // Verify that e is the cause of bankdroidified
- Assert.assertSame(raw, bankdroidified.getCause());
+ ExceptionUtils.blameBankdroid(e);
+ String after = toStringWithStacktrace(e);
- // Verify that re-bankdroidifying is a no-op
- Assert.assertSame(bankdroidified, ExceptionUtils.bankdroidifyException(bankdroidified));
+ Assert.assertEquals(before, after);
+ }
+
+ private String toStringWithStacktrace(Exception e) {
+ StringWriter stringWriter = new StringWriter();
+ PrintWriter printWriter = new PrintWriter(stringWriter);
+ e.printStackTrace(printWriter);
+ printWriter.close();
+ return stringWriter.toString();
}
- /**
- * Test that we can wrap exceptions without (String) constructors.
- */
@Test
- @SuppressWarnings({"PMD.AvoidPrintStackTrace", "PMD.SystemPrintln"})
- public void testBankdroidifyWonkyException() {
- ExceptionThrower.WonkyException raw = null;
- try {
- ExceptionThrower.throwWonkyException();
- Assert.fail("Exception expected");
- } catch (ExceptionThrower.WonkyException e) {
- raw = e;
- }
+ public void testBankdroidifyStacktrace() {
+ StackTraceElement[] bankdroidified = new StackTraceElement[] {
+ new StackTraceElement("not.bankdroid.SomeClass", "someMethod", "SomeClass.java", 42),
+ new StackTraceElement("com.liato.bankdroid.SomeOtherClass", "someOtherMethod", "SomeOtherClass.java", 43),
+ };
+ bankdroidified = ExceptionUtils.bankdroidifyStacktrace(bankdroidified);
- // Print stack traces, useful if the tests fail
- System.err.println("Before:");
- raw.printStackTrace();
+ StackTraceElement[] expected = new StackTraceElement[] {
+ new StackTraceElement("com.liato.bankdroid.SomeOtherClass", "someOtherMethod", "SomeOtherClass.java", 43),
+ };
- // Since bankdroidify() won't be able to create a WonkyException, it
- // should fall back to creating something it extends
- ConnectException bankdroidified = ExceptionUtils.bankdroidifyException(raw);
+ Assert.assertArrayEquals(expected, bankdroidified);
- System.err.println();
- System.err.println("After:");
- bankdroidified.printStackTrace();
+ // Test re-bankdroidification
+ Assert.assertArrayEquals(expected, ExceptionUtils.bankdroidifyStacktrace(bankdroidified));
+ }
- Assert.assertFalse("Test setup: Top frame of initial exception shouldn't be in Bankdroid",
- raw.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+ @Test
+ public void testCloneExceptionWonky() {
+ ExceptionFactory.WonkyException raw = ExceptionFactory.getWonkyException();
+
+ @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+ ConnectException cloned = ExceptionUtils.cloneException(raw);
+
+ assert cloned != null;
+ Assert.assertEquals(raw.getMessage(), cloned.getMessage());
+ Assert.assertArrayEquals(raw.getStackTrace(), cloned.getStackTrace());
+ Assert.assertEquals(
+ "Cloning an uninstantiable Exception should return an instance of its super class",
+ raw.getClass().getSuperclass(), cloned.getClass());
+ }
+
+ @Test
+ @SuppressWarnings({"PMD.AvoidCatchingNPE"})
+ public void testCloneExceptionNPE() {
+ NullPointerException raw = null;
+ try {
+ //noinspection ConstantConditions
+ new Urllib(null);
+ Assert.fail("Exception expected");
+ } catch (NullPointerException e) {
+ raw = e;
+ }
- Assert.assertTrue("Top frame of bankdroidified exception should be in Bankdroid",
- bankdroidified.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+ @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+ NullPointerException cloned = ExceptionUtils.cloneException(raw);
- Assert.assertEquals(raw.getMessage(), bankdroidified.getMessage());
+ assert cloned != null;
+ Assert.assertEquals(raw.getMessage(), cloned.getMessage());
+ Assert.assertArrayEquals(raw.getStackTrace(), cloned.getStackTrace());
+ Assert.assertEquals(raw.getClass(), cloned.getClass());
+ }
- // Verify that e is the cause of bankdroidified
- Assert.assertSame(raw, bankdroidified.getCause());
+ @Test(timeout = 1000)
+ public void testGetUltimateCauseRecursive() {
+ Exception recursive = new Exception();
+ Exception intermediate = new Exception(recursive);
+ recursive.initCause(intermediate);
+ Assert.assertNull(ExceptionUtils.getUltimateCause(recursive));
+ }
- // Verify that re-bankdroidifying is a no-op
- Assert.assertSame(bankdroidified, ExceptionUtils.bankdroidifyException(bankdroidified));
+ @Test
+ public void testConcatArrays() {
+ StackTraceElement s1 = new StackTraceElement("a", "b", "c", 123);
+ StackTraceElement s2 = new StackTraceElement("d", "e", "f", 456);
+ StackTraceElement[] concatenated =
+ ExceptionUtils.concatArrays(
+ new StackTraceElement[]{s1}, new StackTraceElement[]{s2});
+ Assert.assertArrayEquals(new StackTraceElement[]{ s1, s2 }, concatenated);
}
}
diff --git bankdroid-legacy/src/test/java/not/bankdroid/at/all/ExceptionFactory.java bankdroid-legacy/src/test/java/not/bankdroid/at/all/ExceptionFactory.java
new file mode 100644
index 0000000..bc7d6fe
--- /dev/null
+++ bankdroid-legacy/src/test/java/not/bankdroid/at/all/ExceptionFactory.java
@@ -0,0 +1,26 @@
+package not.bankdroid.at.all;
+
+import java.net.ConnectException;
+
+/**
+ * For the test in {@link com.liato.bankdroid.utils.ExceptionUtilsTest}
+ */
+public class ExceptionFactory {
+ public static class WonkyException extends ConnectException {
+ public WonkyException(int wonky) {
+ super("Wonky: " + wonky);
+ }
+ }
+
+ public static WonkyException getWonkyException() {
+ return new WonkyException(5);
+ }
+
+ public static Exception getException() {
+ return new Exception("This is a test Exception");
+ }
+
+ public static Exception getExceptionWithCause() {
+ return new Exception("This Exception has a cause", getException());
+ }
+}
diff --git config/quality/lint/lint.xml config/quality/lint/lint.xml
index 8195ce2..c3565a5 100644
--- config/quality/lint/lint.xml
+++ config/quality/lint/lint.xml
@@ -1,8 +1,11 @@
-
+
+
+
+
diff --git tools/update-suppressions.sh tools/update-suppressions.sh
index 53ff534..1652568 100755
--- tools/update-suppressions.sh
+++ tools/update-suppressions.sh
@@ -21,9 +21,12 @@ function set_lint_suppressions() {
cat > ${LINT_XML} << EOF
-
+
+
+
+
EOF
commit d64ede1abee89d557a5f4e0ea720a265b4256e05
Author: Johan Walles
Date: Thu Nov 3 20:55:57 2016 +0100
Fix wrapping exceptions without String constructors
Before this change, bankdroidifyException() failed if the exception
to wrap didn't come with a String constructor.
Now it works, with tests and all!
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
index e61097b..468b56e 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
@@ -1,5 +1,7 @@
package com.liato.bankdroid.utils;
+import android.support.annotation.Nullable;
+
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
@@ -23,21 +25,10 @@ public class ExceptionUtils {
return exception;
}
- T returnMe;
- try {
- returnMe = (T)exception.getClass().getConstructor(String.class)
- .newInstance(exception.getMessage());
- } catch (InstantiationException e) {
- Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
- return exception;
- } catch (InvocationTargetException e) {
- Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
- return exception;
- } catch (IllegalAccessException e) {
- Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
- return exception;
- } catch (NoSuchMethodException e) {
- Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
+ T returnMe = createWrapperException(exception);
+ if (returnMe == null) {
+ Timber.w(new RuntimeException(
+ "Unable to bankdroidify exception of class: " + exception.getClass()));
return exception;
}
@@ -48,6 +39,27 @@ public class ExceptionUtils {
return returnMe;
}
+ @Nullable
+ private static T createWrapperException(T wrapMe) {
+ Class newClass = wrapMe.getClass();
+ while (newClass != null) {
+ try {
+ return (T) newClass.getConstructor(String.class)
+ .newInstance(wrapMe.getMessage());
+ } catch (InvocationTargetException e) {
+ newClass = newClass.getSuperclass();
+ } catch (NoSuchMethodException e) {
+ newClass = newClass.getSuperclass();
+ } catch (InstantiationException e) {
+ newClass = newClass.getSuperclass();
+ } catch (IllegalAccessException e) {
+ newClass = newClass.getSuperclass();
+ }
+ }
+
+ return null;
+ }
+
/**
* Remove all initial non-Bankdroid frames from a stack.
*
diff --git bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
index 803dc5f..df673c5 100644
--- bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
+++ bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
@@ -3,14 +3,19 @@ package com.liato.bankdroid.utils;
import org.junit.Assert;
import org.junit.Test;
+import java.net.ConnectException;
+
import eu.nullbyte.android.urllib.Urllib;
+import not.bankdroid.at.all.ExceptionThrower;
+@SuppressWarnings("CallToPrintStackTrace")
public class ExceptionUtilsTest {
@Test
- @SuppressWarnings("PMD") // This is for the stack trace printing, we really want to do it here
- public void bankdroidifyException() throws Exception {
+ @SuppressWarnings({"PMD.AvoidPrintStackTrace", "PMD.AvoidCatchingNPE", "PMD.SystemPrintln"})
+ public void testBankdroidifyException() throws Exception {
Exception raw = null;
try {
+ //noinspection ConstantConditions
new Urllib(null);
Assert.fail("Exception expected");
} catch (NullPointerException e) {
@@ -38,4 +43,45 @@ public class ExceptionUtilsTest {
// Verify that re-bankdroidifying is a no-op
Assert.assertSame(bankdroidified, ExceptionUtils.bankdroidifyException(bankdroidified));
}
+
+ /**
+ * Test that we can wrap exceptions without (String) constructors.
+ */
+ @Test
+ @SuppressWarnings({"PMD.AvoidPrintStackTrace", "PMD.SystemPrintln"})
+ public void testBankdroidifyWonkyException() {
+ ExceptionThrower.WonkyException raw = null;
+ try {
+ ExceptionThrower.throwWonkyException();
+ Assert.fail("Exception expected");
+ } catch (ExceptionThrower.WonkyException e) {
+ raw = e;
+ }
+
+ // Print stack traces, useful if the tests fail
+ System.err.println("Before:");
+ raw.printStackTrace();
+
+ // Since bankdroidify() won't be able to create a WonkyException, it
+ // should fall back to creating something it extends
+ ConnectException bankdroidified = ExceptionUtils.bankdroidifyException(raw);
+
+ System.err.println();
+ System.err.println("After:");
+ bankdroidified.printStackTrace();
+
+ Assert.assertFalse("Test setup: Top frame of initial exception shouldn't be in Bankdroid",
+ raw.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+
+ Assert.assertTrue("Top frame of bankdroidified exception should be in Bankdroid",
+ bankdroidified.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+
+ Assert.assertEquals(raw.getMessage(), bankdroidified.getMessage());
+
+ // Verify that e is the cause of bankdroidified
+ Assert.assertSame(raw, bankdroidified.getCause());
+
+ // Verify that re-bankdroidifying is a no-op
+ Assert.assertSame(bankdroidified, ExceptionUtils.bankdroidifyException(bankdroidified));
+ }
}
diff --git bankdroid-legacy/src/test/java/not/bankdroid/at/all/ExceptionThrower.java bankdroid-legacy/src/test/java/not/bankdroid/at/all/ExceptionThrower.java
new file mode 100644
index 0000000..1d21a09
--- /dev/null
+++ bankdroid-legacy/src/test/java/not/bankdroid/at/all/ExceptionThrower.java
@@ -0,0 +1,18 @@
+package not.bankdroid.at.all;
+
+import java.net.ConnectException;
+
+/**
+ * For the test in {@link com.liato.bankdroid.utils.ExceptionUtilsTest}
+ */
+public class ExceptionThrower {
+ public static class WonkyException extends ConnectException {
+ public WonkyException(int wonky) {
+ super("Wonky: " + wonky);
+ }
+ }
+
+ public static void throwWonkyException() throws WonkyException {
+ throw new WonkyException(5);
+ }
+}
commit 04230928f02c083eafa9c631bb82c09f54ce8143
Author: Johan Walles
Date: Fri Nov 4 11:26:49 2016 +0100
PMD: Enforce variable naming
Inspired by a review for another change; these things are better found
by tooling.
Non-final fields with NAMING_INDICATING_FINALITY have been turned into
final fields when possible.
In Bank.java, refactored the API a bit so that bank names can be
constant.
diff --git app/src/main/java/com/liato/bankdroid/BankEditActivity.java app/src/main/java/com/liato/bankdroid/BankEditActivity.java
index 835c64e..88c142e 100644
--- app/src/main/java/com/liato/bankdroid/BankEditActivity.java
+++ app/src/main/java/com/liato/bankdroid/BankEditActivity.java
@@ -81,9 +81,9 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
@InjectView(R.id.txtErrorDesc)
TextView mErrorDescription;
- private Bank SELECTED_BANK;
+ private Bank selectedBank;
- private long BANKID = -1;
+ private long bankId = -1;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -101,16 +101,16 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
Bundle extras = getIntent().getExtras();
if (extras != null) {
- BANKID = extras.getLong("id", -1);
- if (BANKID != -1) {
- Bank bank = BankFactory.bankFromDb(BANKID, this, false);
+ bankId = extras.getLong("id", -1);
+ if (bankId != -1) {
+ Bank bank = BankFactory.bankFromDb(bankId, this, false);
if (bank != null) {
mErrorDescription.setVisibility(
bank.isDisabled() ? View.VISIBLE : View.INVISIBLE);
mBankSpinner.setEnabled(false);
mBankSpinner.setSelection(adapter.getPosition(bank));
- SELECTED_BANK = bank;
- createForm(SELECTED_BANK.getConnectionConfiguration(),
+ selectedBank = bank;
+ createForm(selectedBank.getConnectionConfiguration(),
DefaultConnectionConfiguration.fields()
);
populateForm(bank);
@@ -125,10 +125,10 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
if (!validate()) {
return;
}
- SELECTED_BANK.setProperties(getFormParameters(SELECTED_BANK.getConnectionConfiguration()));
- SELECTED_BANK.setCustomName(getFormParameter(DefaultConnectionConfiguration.NAME));
- SELECTED_BANK.setDbid(BANKID);
- new DataRetrieverTask(this, SELECTED_BANK).execute();
+ selectedBank.setProperties(getFormParameters(selectedBank.getConnectionConfiguration()));
+ selectedBank.setCustomName(getFormParameter(DefaultConnectionConfiguration.NAME));
+ selectedBank.setDbid(bankId);
+ new DataRetrieverTask(this, selectedBank).execute();
}
@OnClick(R.id.btnSettingsCancel)
@@ -139,10 +139,10 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
@Override
public void onItemSelected(AdapterView parentView, View selectedItemView, int pos, long id) {
Bank selectedBank = (Bank) parentView.getItemAtPosition(pos);
- if (SELECTED_BANK == null || !SELECTED_BANK.equals(selectedBank)) {
- SELECTED_BANK = selectedBank;
+ if (this.selectedBank == null || !this.selectedBank.equals(selectedBank)) {
+ this.selectedBank = selectedBank;
mFormContainer.removeAllViewsInLayout();
- createForm(SELECTED_BANK.getConnectionConfiguration(),
+ createForm(this.selectedBank.getConnectionConfiguration(),
DefaultConnectionConfiguration.fields()
);
}
@@ -233,7 +233,7 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
private boolean validate() {
boolean valid = true;
- Iterator fields = Iterators.concat(SELECTED_BANK.getConnectionConfiguration().iterator(),
+ Iterator fields = Iterators.concat(selectedBank.getConnectionConfiguration().iterator(),
DefaultConnectionConfiguration.fields().iterator());
while (fields.hasNext()) {
Field field = fields.next();
@@ -357,8 +357,8 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
builder.setTitle(R.string.select_a_bank);
builder.setItems(items, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int item) {
- SELECTED_BANK.setExtras(e.getBanks().get(item).getId());
- new DataRetrieverTask(context, SELECTED_BANK).execute();
+ selectedBank.setExtras(e.getBanks().get(item).getId());
+ new DataRetrieverTask(context, selectedBank).execute();
}
});
} else {
diff --git app/src/main/java/com/liato/bankdroid/LockableActivity.java app/src/main/java/com/liato/bankdroid/LockableActivity.java
index 1b5720f..397b3e1 100644
--- app/src/main/java/com/liato/bankdroid/LockableActivity.java
+++ app/src/main/java/com/liato/bankdroid/LockableActivity.java
@@ -40,7 +40,7 @@ import android.view.WindowManager;
public class LockableActivity extends ActionBarActivity {
- private static int PATTERNLOCK_UNLOCK = 42;
+ private static final int PATTERNLOCK_UNLOCK = 42;
protected boolean mSkipLockOnce = false;
diff --git app/src/main/java/com/liato/bankdroid/LockablePreferenceActivity.java app/src/main/java/com/liato/bankdroid/LockablePreferenceActivity.java
index ffa55f5..b690302 100644
--- app/src/main/java/com/liato/bankdroid/LockablePreferenceActivity.java
+++ app/src/main/java/com/liato/bankdroid/LockablePreferenceActivity.java
@@ -31,7 +31,7 @@ import android.view.WindowManager;
public class LockablePreferenceActivity extends PreferenceActivity {
- private static int PATTERNLOCK_UNLOCK = 42;
+ private static final int PATTERNLOCK_UNLOCK = 42;
private SharedPreferences mPrefs;
diff --git app/src/main/java/com/liato/bankdroid/MainActivity.java app/src/main/java/com/liato/bankdroid/MainActivity.java
index 48acb74..98c8a2b 100644
--- app/src/main/java/com/liato/bankdroid/MainActivity.java
+++ app/src/main/java/com/liato/bankdroid/MainActivity.java
@@ -59,9 +59,9 @@ public class MainActivity extends LockableActivity {
protected static boolean showHidden = false;
- private static Bank selected_bank = null;
+ private static Bank selectedBank = null;
- private static Account selected_account = null;
+ private static Account selectedAccount = null;
private final BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
@@ -91,14 +91,14 @@ public class MainActivity extends LockableActivity {
public boolean onItemLongClick(final AdapterView parent, final View view,
final int position, final long id) {
if (adapter.getItem(position) instanceof Account) {
- selected_account = (Account) adapter.getItem(position);
+ selectedAccount = (Account) adapter.getItem(position);
final PopupMenuAccount pmenu = new PopupMenuAccount(parent, view, MainActivity.this);
pmenu.showLikeQuickAction(0, 12);
return true;
} else if (adapter.getItem(position) instanceof Bank) {
- selected_bank = (Bank) adapter.getItem(position);
- selected_bank.toggleHideAccounts();
- DBAdapter.save(selected_bank, MainActivity.this);
+ selectedBank = (Bank) adapter.getItem(position);
+ selectedBank.toggleHideAccounts();
+ DBAdapter.save(selectedBank, MainActivity.this);
refreshView();
return true;
}
@@ -110,7 +110,7 @@ public class MainActivity extends LockableActivity {
public void onItemClick(final AdapterView parent, final View view,
final int position, final long id) {
if (adapter.getItem(position) instanceof Bank) {
- selected_bank = (Bank) adapter.getItem(position);
+ selectedBank = (Bank) adapter.getItem(position);
final PopupMenuBank pmenu = new PopupMenuBank(parent, view, MainActivity.this);
pmenu.showLikeQuickAction(0, 12);
} else {
@@ -241,7 +241,7 @@ public class MainActivity extends LockableActivity {
final Button btnHide = (Button) root.findViewById(R.id.btnHide);
final Button btnUnhide = (Button) root.findViewById(R.id.btnUnhide);
final Button btnWWW = (Button) root.findViewById(R.id.btnWWW);
- if (selected_bank.getHideAccounts()) {
+ if (selectedBank.getHideAccounts()) {
btnHide.setVisibility(View.GONE);
btnUnhide.setVisibility(View.VISIBLE);
btnUnhide.setOnClickListener(this);
@@ -250,7 +250,7 @@ public class MainActivity extends LockableActivity {
btnUnhide.setVisibility(View.GONE);
btnHide.setOnClickListener(this);
}
- if (selected_bank.isWebViewEnabled()) {
+ if (selectedBank.isWebViewEnabled()) {
btnWWW.setOnClickListener(this);
} else {
btnWWW.setVisibility(View.GONE);
@@ -270,29 +270,29 @@ public class MainActivity extends LockableActivity {
case R.id.btnHide:
case R.id.btnUnhide:
this.dismiss();
- selected_bank.toggleHideAccounts();
- DBAdapter.save(selected_bank, context);
+ selectedBank.toggleHideAccounts();
+ DBAdapter.save(selectedBank, context);
parent.refreshView();
return;
case R.id.btnWWW:
- if (selected_bank != null && selected_bank.isWebViewEnabled()) {
- //Uri uri = Uri.parse(selected_bank.getURL());
+ if (selectedBank != null && selectedBank.isWebViewEnabled()) {
+ //Uri uri = Uri.parse(selectedBank.getURL());
//Intent intent = new Intent(Intent.ACTION_VIEW, uri);
final Intent intent = new Intent(context, WebViewActivity.class);
- intent.putExtra("bankid", selected_bank.getDbId());
+ intent.putExtra("bankid", selectedBank.getDbId());
context.startActivity(intent);
}
this.dismiss();
return;
case R.id.btnEdit:
final Intent intent = new Intent(context, BankEditActivity.class);
- intent.putExtra("id", selected_bank.getDbId());
+ intent.putExtra("id", selectedBank.getDbId());
context.startActivity(intent);
this.dismiss();
return;
case R.id.btnRefresh:
this.dismiss();
- new DataRetrieverTask(parent, selected_bank.getDbId()).execute();
+ new DataRetrieverTask(parent, selectedBank.getDbId()).execute();
return;
case R.id.btnRemove:
this.dismiss();
@@ -307,7 +307,7 @@ public class MainActivity extends LockableActivity {
public void onClick(final DialogInterface dialog,
final int id) {
final DBAdapter db = new DBAdapter(context);
- db.deleteBank(selected_bank.getDbId());
+ db.deleteBank(selectedBank.getDbId());
dialog.cancel();
parent.refreshView();
}
@@ -358,7 +358,7 @@ public class MainActivity extends LockableActivity {
.findViewById(R.id.btnDisableNotifications);
final Button btnEnableNotifications = (Button) root
.findViewById(R.id.btnEnableNotifications);
- if (selected_account.isHidden()) {
+ if (selectedAccount.isHidden()) {
btnHide.setVisibility(View.GONE);
btnUnhide.setVisibility(View.VISIBLE);
btnUnhide.setOnClickListener(this);
@@ -367,7 +367,7 @@ public class MainActivity extends LockableActivity {
btnUnhide.setVisibility(View.GONE);
btnHide.setOnClickListener(this);
}
- if (selected_account.isNotify()) {
+ if (selectedAccount.isNotify()) {
btnDisableNotifications.setVisibility(View.VISIBLE);
btnDisableNotifications.setOnClickListener(this);
btnEnableNotifications.setVisibility(View.GONE);
@@ -385,26 +385,26 @@ public class MainActivity extends LockableActivity {
switch (id) {
case R.id.btnHide:
this.dismiss();
- selected_account.setHidden(true);
- DBAdapter.save(selected_account.getBank(), parent);
+ selectedAccount.setHidden(true);
+ DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
case R.id.btnUnhide:
this.dismiss();
- selected_account.setHidden(false);
- DBAdapter.save(selected_account.getBank(), parent);
+ selectedAccount.setHidden(false);
+ DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
case R.id.btnEnableNotifications:
this.dismiss();
- selected_account.setNotify(true);
- DBAdapter.save(selected_account.getBank(), parent);
+ selectedAccount.setNotify(true);
+ DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
case R.id.btnDisableNotifications:
this.dismiss();
- selected_account.setNotify(false);
- DBAdapter.save(selected_account.getBank(), parent);
+ selectedAccount.setNotify(false);
+ DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
diff --git app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
index 7a82c5b..6af968b 100644
--- app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
+++ app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
@@ -394,15 +394,15 @@ public class AutoRefreshService extends Service {
}
} catch (final BankException e) {
// Refresh widgets if an update fails
- Timber.e(e, "Could not update bank %s", bank.getShortName());
+ Timber.e(e, "Could not update bank %s", bank.getName());
} catch (final LoginException e) {
- Timber.d(e, "Invalid credentials for bank %s", bank.getShortName());
+ Timber.d(e, "Invalid credentials for bank %s", bank.getName());
refreshWidgets = true;
db.disableBank(bank.getDbId());
} catch (BankChoiceException e) {
Timber.w(e, "BankChoiceException");
} catch (Exception e) {
- Timber.e(e, "An unexpected error occurred while updating bank %s", bank.getShortName());
+ Timber.e(e, "An unexpected error occurred while updating bank %s", bank.getName());
}
}
diff --git app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
index fd0011c..e6dfd7f 100644
--- app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
+++ app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
@@ -390,15 +390,15 @@ public abstract class BankdroidWidgetProvider extends AppWidgetProvider {
}
} catch (BankException e) {
- Timber.e(e, "Could not update bank %s", bank.getShortName());
+ Timber.e(e, "Could not update bank %s", bank.getName());
} catch (LoginException e) {
- Timber.w(e, "Invalid credentials for bank %s", bank.getShortName());
+ Timber.w(e, "Invalid credentials for bank %s", bank.getName());
DBAdapter.disable(bank, context);
} catch (BankChoiceException e) {
Timber.w(e, "BankChoiceException");
} catch (IOException e) {
if (NetworkUtils.isInternetAvailable()) {
- Timber.e(e, "Could not update bank %s", bank.getShortName());
+ Timber.e(e, "Could not update bank %s", bank.getName());
}
}
BankdroidWidgetProvider.updateAppWidget(context, appWidgetManager, appWidgetId);
diff --git app/src/main/java/com/liato/bankdroid/provider/BankTransactionsProvider.java app/src/main/java/com/liato/bankdroid/provider/BankTransactionsProvider.java
index 3e16654..0610ad7 100644
--- app/src/main/java/com/liato/bankdroid/provider/BankTransactionsProvider.java
+++ app/src/main/java/com/liato/bankdroid/provider/BankTransactionsProvider.java
@@ -67,44 +67,44 @@ public class BankTransactionsProvider extends ContentProvider implements
private static final String TRANSACTIONS_TABLE = "transactions";
- private final static UriMatcher uriMatcher;
+ private final static UriMatcher URI_MATCHER;
- private final static Map bankAccountProjectionMap;
+ private final static Map BANK_ACCOUNT_PROJECTION_MAP;
- private final static Map transProjectionMap;
+ private final static Map TRANS_PROJECTION_MAP;
static {
- uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
- uriMatcher.addURI(AUTHORITY, TRANSACTIONS_CAT + "/" + WILD_CARD,
+ URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
+ URI_MATCHER.addURI(AUTHORITY, TRANSACTIONS_CAT + "/" + WILD_CARD,
TRANSACTIONS);
- uriMatcher.addURI(AUTHORITY, BANK_ACCOUNTS_CAT + "/" + WILD_CARD,
+ URI_MATCHER.addURI(AUTHORITY, BANK_ACCOUNTS_CAT + "/" + WILD_CARD,
BANK_ACCOUNTS);
// Projections are "Poor mans views" of the data.
- bankAccountProjectionMap = new HashMap();
+ BANK_ACCOUNT_PROJECTION_MAP = new HashMap();
// Must match bankAccountProjection in
// IBankTransactionsProvider#bankAccountProjection
- bankAccountProjectionMap.put(BANK_ID, BANK_ID);
- bankAccountProjectionMap.put(BANK_NAME, BANK_NAME);
- bankAccountProjectionMap.put(BANK_TYPE, BANK_TYPE);
- bankAccountProjectionMap.put(BANK_LAST_UPDATED, BANK_LAST_UPDATED);
- bankAccountProjectionMap.put(ACC_ID, ACC_ID);
- bankAccountProjectionMap.put(ACC_NAME, ACC_NAME);
+ BANK_ACCOUNT_PROJECTION_MAP.put(BANK_ID, BANK_ID);
+ BANK_ACCOUNT_PROJECTION_MAP.put(BANK_NAME, BANK_NAME);
+ BANK_ACCOUNT_PROJECTION_MAP.put(BANK_TYPE, BANK_TYPE);
+ BANK_ACCOUNT_PROJECTION_MAP.put(BANK_LAST_UPDATED, BANK_LAST_UPDATED);
+ BANK_ACCOUNT_PROJECTION_MAP.put(ACC_ID, ACC_ID);
+ BANK_ACCOUNT_PROJECTION_MAP.put(ACC_NAME, ACC_NAME);
// Table name has to be explicitly included here since Banks also have a column named balance.
- bankAccountProjectionMap.put(ACC_BALANCE, ACCOUNT_TABLE + "." + ACC_BALANCE);
- bankAccountProjectionMap.put(ACC_TYPE, ACC_TYPE);
+ BANK_ACCOUNT_PROJECTION_MAP.put(ACC_BALANCE, ACCOUNT_TABLE + "." + ACC_BALANCE);
+ BANK_ACCOUNT_PROJECTION_MAP.put(ACC_TYPE, ACC_TYPE);
- transProjectionMap = new HashMap();
+ TRANS_PROJECTION_MAP = new HashMap();
// Must match transactionProjection in
// IBankTransactionsProvider#transactionProjection
- transProjectionMap.put(TRANS_ID, TRANS_ID);
- transProjectionMap.put(TRANS_DATE, TRANS_DATE);
- transProjectionMap.put(TRANS_DESC, TRANS_DESC);
- transProjectionMap.put(TRANS_AMT, TRANS_AMT);
- transProjectionMap.put(TRANS_CUR, TRANS_CUR);
- transProjectionMap.put(TRANS_ACCNT, TRANS_ACCNT);
+ TRANS_PROJECTION_MAP.put(TRANS_ID, TRANS_ID);
+ TRANS_PROJECTION_MAP.put(TRANS_DATE, TRANS_DATE);
+ TRANS_PROJECTION_MAP.put(TRANS_DESC, TRANS_DESC);
+ TRANS_PROJECTION_MAP.put(TRANS_AMT, TRANS_AMT);
+ TRANS_PROJECTION_MAP.put(TRANS_CUR, TRANS_CUR);
+ TRANS_PROJECTION_MAP.put(TRANS_ACCNT, TRANS_ACCNT);
}
private DatabaseHelper dbHelper;
@@ -143,7 +143,7 @@ public class BankTransactionsProvider extends ContentProvider implements
public String getType(final Uri uri) {
Timber.d("Got URI: %s", uri.toString());
- switch (uriMatcher.match(uri)) {
+ switch (URI_MATCHER.match(uri)) {
case BANK_ACCOUNTS:
return BANK_ACCOUNTS_MIME;
case TRANSACTIONS:
@@ -207,12 +207,12 @@ public class BankTransactionsProvider extends ContentProvider implements
if (BANK_ACCOUNTS_MIME.equals(getType(uri))) {
qb = new SQLiteQueryBuilder();
qb.setTables(BANK_ACCOUNT_TABLES);
- qb.setProjectionMap(bankAccountProjectionMap);
+ qb.setProjectionMap(BANK_ACCOUNT_PROJECTION_MAP);
qb.setDistinct(true);
} else if (TRANSACTIONS_MIME.equals(getType(uri))) {
qb = new SQLiteQueryBuilder();
qb.setTables(TRANSACTIONS_TABLE);
- qb.setProjectionMap(transProjectionMap);
+ qb.setProjectionMap(TRANS_PROJECTION_MAP);
} else {
throw new IllegalArgumentException("Unsupported URI: " + uri);
}
diff --git app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
index 87a0c1d..8997f8f 100644
--- app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
+++ app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
@@ -41,7 +41,7 @@ public class ColorPickerPreference
Preference.OnPreferenceClickListener,
ColorPickerDialog.OnColorChangedListener {
- private static final String androidns = "http://schemas.android.com/apk/res/android";
+ private static final String ANDROID_NS = "http://schemas.android.com/apk/res/android";
private ViewGroup parent;
@@ -137,7 +137,7 @@ public class ColorPickerPreference
mDensity = getContext().getResources().getDisplayMetrics().density;
setOnPreferenceClickListener(this);
if (attrs != null) {
- String defaultValue = attrs.getAttributeValue(androidns, "defaultValue");
+ String defaultValue = attrs.getAttributeValue(ANDROID_NS, "defaultValue");
if (defaultValue.startsWith("#")) {
try {
mDefaultValue = convertToColorInt(defaultValue);
@@ -146,7 +146,7 @@ public class ColorPickerPreference
mDefaultValue = convertToColorInt("#FF000000");
}
} else {
- int resourceId = attrs.getAttributeResourceValue(androidns, "defaultValue", 0);
+ int resourceId = attrs.getAttributeResourceValue(ANDROID_NS, "defaultValue", 0);
if (resourceId != 0) {
mDefaultValue = context.getResources().getInteger(resourceId);
}
diff --git app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java
index 8ff79d3..13af48e 100644
--- app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java
+++ app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java
@@ -64,29 +64,29 @@ public class ColorPickerView extends View {
/**
* The width in dp of the hue panel.
*/
- private float HUE_PANEL_WIDTH = 30f;
+ private float huePanelWidth = 30f;
/**
* The height in dp of the alpha panel
*/
- private float ALPHA_PANEL_HEIGHT = 20f;
+ private float alphaPanelHeight = 20f;
/**
* The distance in dp between the different
* color panels.
*/
- private float PANEL_SPACING = 10f;
+ private float panelSpacing = 10f;
/**
* The radius in dp of the color palette tracker circle.
*/
- private float PALETTE_CIRCLE_TRACKER_RADIUS = 5f;
+ private float paletteCircleTrackerRadius = 5f;
/**
* The dp which the tracker of the hue or alpha panel
* will extend outside of its bounds.
*/
- private float RECTANGLE_TRACKER_OFFSET = 2f;
+ private float rectangleTrackerOffset = 2f;
private float mDensity = 1f;
@@ -172,11 +172,11 @@ public class ColorPickerView extends View {
setLayerType(View.LAYER_TYPE_SOFTWARE, null);
}
mDensity = getContext().getResources().getDisplayMetrics().density;
- PALETTE_CIRCLE_TRACKER_RADIUS *= mDensity;
- RECTANGLE_TRACKER_OFFSET *= mDensity;
- HUE_PANEL_WIDTH *= mDensity;
- ALPHA_PANEL_HEIGHT *= mDensity;
- PANEL_SPACING = PANEL_SPACING * mDensity;
+ paletteCircleTrackerRadius *= mDensity;
+ rectangleTrackerOffset *= mDensity;
+ huePanelWidth *= mDensity;
+ alphaPanelHeight *= mDensity;
+ panelSpacing = panelSpacing * mDensity;
mDrawingOffset = calculateRequiredOffset();
@@ -216,7 +216,7 @@ public class ColorPickerView extends View {
}
private float calculateRequiredOffset() {
- float offset = Math.max(PALETTE_CIRCLE_TRACKER_RADIUS, RECTANGLE_TRACKER_OFFSET);
+ float offset = Math.max(paletteCircleTrackerRadius, rectangleTrackerOffset);
offset = Math.max(offset, BORDER_WIDTH_PX * mDensity);
return offset * 1.5f;
@@ -274,11 +274,11 @@ public class ColorPickerView extends View {
Point p = satValToPoint(mSat, mVal);
mSatValTrackerPaint.setColor(0xff000000);
- canvas.drawCircle(p.x, p.y, PALETTE_CIRCLE_TRACKER_RADIUS - 1f * mDensity,
+ canvas.drawCircle(p.x, p.y, paletteCircleTrackerRadius - 1f * mDensity,
mSatValTrackerPaint);
mSatValTrackerPaint.setColor(0xffdddddd);
- canvas.drawCircle(p.x, p.y, PALETTE_CIRCLE_TRACKER_RADIUS, mSatValTrackerPaint);
+ canvas.drawCircle(p.x, p.y, paletteCircleTrackerRadius, mSatValTrackerPaint);
}
@@ -308,8 +308,8 @@ public class ColorPickerView extends View {
Point p = hueToPoint(mHue);
RectF r = new RectF();
- r.left = rect.left - RECTANGLE_TRACKER_OFFSET;
- r.right = rect.right + RECTANGLE_TRACKER_OFFSET;
+ r.left = rect.left - rectangleTrackerOffset;
+ r.right = rect.right + rectangleTrackerOffset;
r.top = p.y - rectHeight;
r.bottom = p.y + rectHeight;
@@ -359,8 +359,8 @@ public class ColorPickerView extends View {
RectF r = new RectF();
r.left = p.x - rectWidth;
r.right = p.x + rectWidth;
- r.top = rect.top - RECTANGLE_TRACKER_OFFSET;
- r.bottom = rect.bottom + RECTANGLE_TRACKER_OFFSET;
+ r.top = rect.top - rectangleTrackerOffset;
+ r.bottom = rect.bottom + rectangleTrackerOffset;
canvas.drawRoundRect(r, 2, 2, mHueTrackerPaint);
@@ -663,22 +663,22 @@ public class ColorPickerView extends View {
if (!mShowAlphaPanel) {
- height = (int) (widthAllowed - PANEL_SPACING - HUE_PANEL_WIDTH);
+ height = (int) (widthAllowed - panelSpacing - huePanelWidth);
//If calculated height (based on the width) is more than the allowed height.
if (height > heightAllowed || getTag().equals("landscape")) {
height = heightAllowed;
- width = (int) (height + PANEL_SPACING + HUE_PANEL_WIDTH);
+ width = (int) (height + panelSpacing + huePanelWidth);
} else {
width = widthAllowed;
}
} else {
- width = (int) (heightAllowed - ALPHA_PANEL_HEIGHT + HUE_PANEL_WIDTH);
+ width = (int) (heightAllowed - alphaPanelHeight + huePanelWidth);
if (width > widthAllowed) {
width = widthAllowed;
- height = (int) (widthAllowed - HUE_PANEL_WIDTH + ALPHA_PANEL_HEIGHT);
+ height = (int) (widthAllowed - huePanelWidth + alphaPanelHeight);
} else {
height = heightAllowed;
}
@@ -709,10 +709,10 @@ public class ColorPickerView extends View {
int width = getPrefferedHeight();
if (mShowAlphaPanel) {
- width -= (PANEL_SPACING + ALPHA_PANEL_HEIGHT);
+ width -= (panelSpacing + alphaPanelHeight);
}
- return (int) (width + HUE_PANEL_WIDTH + PANEL_SPACING);
+ return (int) (width + huePanelWidth + panelSpacing);
}
@@ -721,7 +721,7 @@ public class ColorPickerView extends View {
int height = (int) (200 * mDensity);
if (mShowAlphaPanel) {
- height += PANEL_SPACING + ALPHA_PANEL_HEIGHT;
+ height += panelSpacing + alphaPanelHeight;
}
return height;
@@ -748,7 +748,7 @@ public class ColorPickerView extends View {
float panelSide = dRect.height() - BORDER_WIDTH_PX * 2;
if (mShowAlphaPanel) {
- panelSide -= PANEL_SPACING + ALPHA_PANEL_HEIGHT;
+ panelSide -= panelSpacing + alphaPanelHeight;
}
float left = dRect.left + BORDER_WIDTH_PX;
@@ -762,10 +762,10 @@ public class ColorPickerView extends View {
private void setUpHueRect() {
final RectF dRect = mDrawingRect;
- float left = dRect.right - HUE_PANEL_WIDTH + BORDER_WIDTH_PX;
+ float left = dRect.right - huePanelWidth + BORDER_WIDTH_PX;
float top = dRect.top + BORDER_WIDTH_PX;
- float bottom = dRect.bottom - BORDER_WIDTH_PX - (mShowAlphaPanel ? (PANEL_SPACING
- + ALPHA_PANEL_HEIGHT) : 0);
+ float bottom = dRect.bottom - BORDER_WIDTH_PX - (mShowAlphaPanel ? (panelSpacing
+ + alphaPanelHeight) : 0);
float right = dRect.right - BORDER_WIDTH_PX;
mHueRect = new RectF(left, top, right, bottom);
@@ -780,7 +780,7 @@ public class ColorPickerView extends View {
final RectF dRect = mDrawingRect;
float left = dRect.left + BORDER_WIDTH_PX;
- float top = dRect.bottom - ALPHA_PANEL_HEIGHT + BORDER_WIDTH_PX;
+ float top = dRect.bottom - alphaPanelHeight + BORDER_WIDTH_PX;
float bottom = dRect.bottom - BORDER_WIDTH_PX;
float right = dRect.right - BORDER_WIDTH_PX;
diff --git app/src/test/java/com/liato/bankdroid/appwidget/DataRetrieverTaskTest.java app/src/test/java/com/liato/bankdroid/appwidget/DataRetrieverTaskTest.java
index b821497..5e3de22 100644
--- app/src/test/java/com/liato/bankdroid/appwidget/DataRetrieverTaskTest.java
+++ app/src/test/java/com/liato/bankdroid/appwidget/DataRetrieverTaskTest.java
@@ -3,6 +3,7 @@ package com.liato.bankdroid.appwidget;
import com.liato.bankdroid.banking.Account;
import com.liato.bankdroid.banking.Bank;
import com.liato.bankdroid.db.DBAdapter;
+import com.liato.bankdroid.provider.IBankTypes;
import org.junit.Assert;
import org.junit.Test;
@@ -56,6 +57,16 @@ public class DataRetrieverTaskTest {
public BigDecimal getBalance() {
return getAccounts().get(0).getBalance();
}
+
+ @Override
+ public int getBanktypeId() {
+ return IBankTypes.TESTBANK;
+ }
+
+ @Override
+ public String getName() {
+ return "Testbanken";
+ }
}
private static class TestableDataRetrieverTask extends AutoRefreshService.DataRetrieverTask {
diff --git bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java
index 3a47c5b..2fefbb9 100644
--- bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java
+++ bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java
@@ -12,7 +12,7 @@ public class DefaultConnectionConfiguration {
public static final String NAME = "provider.configuration.name";
- private final static List configuration = createConfiguration();
+ private final static List CONFIGURATION = createConfiguration();
private static List createConfiguration() {
List configuration = new ArrayList<>();
@@ -24,6 +24,6 @@ public class DefaultConnectionConfiguration {
}
public static List fields() {
- return configuration;
+ return CONFIGURATION;
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java
index 2ea759a..7e53cf4 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java
@@ -38,7 +38,7 @@ import timber.log.Timber;
public class Helpers {
private static final StrikethroughSpan STRIKE_THROUGH_SPAN = new StrikethroughSpan();
- private final static String[] currencies = {"AED", "AFN", "ALL", "AMD", "ANG", "AOA", "ARS",
+ private final static String[] CURRENCIES = {"AED", "AFN", "ALL", "AMD", "ANG", "AOA", "ARS",
"AUD",
"AWG", "AZN", "BAM", "BBD", "BDT", "BGN", "BHD", "BIF",
"BMD", "BND", "BOB", "BRL", "BSD", "BTN", "BWP", "BYR",
@@ -62,7 +62,7 @@ public class Helpers {
"XAU", "XCD", "XDR", "XOF", "XPD", "XPF", "XPT", "YER",
"ZAR", "ZMK", "ZWD"};
- private final static String[][] symMappings = {{"$U", "UYU"}, {"$b", "BOB"}, {"BZ$", "BZD"},
+ private final static String[][] SYM_MAPPINGS = {{"$U", "UYU"}, {"$b", "BOB"}, {"BZ$", "BZD"},
{"C$", "NIO"}, {"J$", "JMD"}, {"NT$", "TWD"},
{"R$", "BRL"}, {"RD$", "DOP"}, {"TT$", "TTD"},
{"Z$", "ZWD"}, {"$", "USD"}, {"B/.", "PAB"},
@@ -148,12 +148,12 @@ public class Helpers {
public static String parseCurrency(String text, String def) {
text = text != null ? text.toLowerCase() : "";
- for (String currency : currencies) {
+ for (String currency : CURRENCIES) {
if (text.contains(currency)) {
return currency;
}
}
- for (String[] symCur : symMappings) {
+ for (String[] symCur : SYM_MAPPINGS) {
if (text.contains(symCur[0])) {
return symCur[1];
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java
index 18a6a0c..b3f6e97 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java
@@ -54,14 +54,6 @@ public abstract class Bank implements Comparable, IBankTypes {
@DrawableRes
private final int logoResource;
- protected String TAG = "Bank";
-
- protected String NAME = "Bank";
-
- protected String NAME_SHORT = "bank";
-
- protected int BANKTYPE_ID = 0;
-
/**
* URL for human-accessible web bank.
*
@@ -71,43 +63,43 @@ public abstract class Bank implements Comparable, IBankTypes {
* @see #isWebViewEnabled()
*/
@Nullable
- protected String URL;
+ protected String url;
- protected int INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_TEXT;
+ protected int inputTypeUsername = InputType.TYPE_CLASS_TEXT;
- protected int INPUT_TYPE_PASSWORD = InputType.TYPE_CLASS_TEXT
+ protected int inputTypePassword = InputType.TYPE_CLASS_TEXT
| InputType.TYPE_TEXT_VARIATION_PASSWORD;
- protected int INPUT_TYPE_EXTRAS = InputType.TYPE_CLASS_TEXT;
+ private static final int INPUT_TYPE_EXTRAS = InputType.TYPE_CLASS_TEXT;
- protected String INPUT_HINT_USERNAME = null;
+ protected String inputHintUsername = null;
- protected boolean INPUT_HIDDEN_USERNAME = false;
+ private static final boolean INPUT_HIDDEN_USERNAME = false;
- protected boolean INPUT_HIDDEN_PASSWORD = false;
+ protected boolean inputHiddenPassword = false;
- protected boolean INPUT_HIDDEN_EXTRAS = true;
+ private static final boolean INPUT_HIDDEN_EXTRAS = true;
- protected int INPUT_TITLETEXT_USERNAME = R.string.username;
+ protected int inputTitletextUsername = R.string.username;
- protected int INPUT_TITLETEXT_PASSWORD = R.string.password;
+ private final int INPUT_TITLETEXT_PASSWORD = R.string.password;
- protected int INPUT_TITLETEXT_EXTRAS = R.string.extras_field;
+ private final int INPUT_TITLETEXT_EXTRAS = R.string.extras_field;
- protected boolean STATIC_BALANCE = false;
+ protected boolean staticBalance = false;
- protected boolean BROKEN = false;
+ private static final boolean BROKEN = false;
- protected boolean DISPLAY_DECIMALS = true;
+ protected boolean displayDecimals = true;
/**
* Whether or not we support opening the web version of a bank.
*
* Lots of banks don't have this any more, but have apps instead.
* @see #isWebViewEnabled()
- * @see #URL
+ * @see #url
*/
- protected boolean WEB_VIEW_ENABLED = true;
+ protected boolean webViewEnabled = true;
protected Context context;
@@ -229,7 +221,7 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public BigDecimal getBalance() {
- if (STATIC_BALANCE) {
+ if (staticBalance) {
return balance;
} else {
BigDecimal bal = new BigDecimal(0);
@@ -246,13 +238,9 @@ public abstract class Bank implements Comparable, IBankTypes {
}
}
- public int getBanktypeId() {
- return BANKTYPE_ID;
- }
+ public abstract int getBanktypeId();
- public String getName() {
- return NAME;
- }
+ public abstract String getName();
public String getDisplayName() {
if (customName != null && customName.length() > 0) {
@@ -278,10 +266,6 @@ public abstract class Bank implements Comparable, IBankTypes {
getProperties().put(LegacyProviderConfiguration.EXTRAS, extras);
}
- public String getShortName() {
- return NAME_SHORT;
- }
-
public void setData(BigDecimal balance,
boolean disabled, long dbid, String currency, String customName,
int hideAccounts) {
@@ -314,15 +298,15 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public String getURL() {
- return URL;
+ return url;
}
public int getInputTypeUsername() {
- return INPUT_TYPE_USERNAME;
+ return inputTypeUsername;
}
public int getInputTypePassword() {
- return INPUT_TYPE_PASSWORD;
+ return inputTypePassword;
}
public int getInputTypeExtras() {
@@ -330,7 +314,7 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public String getInputHintUsername() {
- return INPUT_HINT_USERNAME;
+ return inputHintUsername;
}
public boolean isInputUsernameHidden() {
@@ -338,7 +322,7 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public boolean isInputPasswordHidden() {
- return INPUT_HIDDEN_PASSWORD;
+ return inputHiddenPassword;
}
public boolean isInputExtrasHidden() {
@@ -346,7 +330,7 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public int getInputTitleUsername() {
- return INPUT_TITLETEXT_USERNAME;
+ return inputTitletextUsername;
}
public int getInputTitlePassword() {
@@ -361,11 +345,11 @@ public abstract class Bank implements Comparable, IBankTypes {
* Whether or not we support opening the web version of a bank.
*
* Lots of banks don't have this any more, but have apps instead.
- * @see #WEB_VIEW_ENABLED
- * @see #URL
+ * @see #webViewEnabled
+ * @see #url
*/
public boolean isWebViewEnabled() {
- return URL != null && WEB_VIEW_ENABLED;
+ return url != null && webViewEnabled;
}
public Map getProperties() {
@@ -455,7 +439,7 @@ public abstract class Bank implements Comparable, IBankTypes {
Timber.e(e, "Error getting session package");
}
String html = String.format(preloader,
- String.format("function go(){window.location=\"%s\" }", this.URL),
+ String.format("function go(){window.location=\"%s\" }", this.url),
// Javascript function
"" // HTML
);
@@ -467,7 +451,7 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public boolean getDisplayDecimals() {
- return DISPLAY_DECIMALS;
+ return displayDecimals;
}
protected Context getContext() {
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AbsIkanoPartner.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AbsIkanoPartner.java
index 1abfc23..61ce9dd 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AbsIkanoPartner.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AbsIkanoPartner.java
@@ -58,10 +58,10 @@ public abstract class AbsIkanoPartner extends Bank {
public AbsIkanoPartner(Context context, @DrawableRes int logoResource) {
super(context, logoResource);
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = true;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = true;
}
public AbsIkanoPartner(String username, String password, Context context, @DrawableRes int logoResource)
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusInvest.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusInvest.java
index f84865b..848b842 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusInvest.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusInvest.java
@@ -46,8 +46,6 @@ public class AkeliusInvest extends Bank {
private static final String NAME = "Akelius Invest";
- private static final String NAME_SHORT = "akeliusinvest";
-
private static final String URL = "https://online.akeliusinvest.com/";
private static final int BANKTYPE_ID = IBankTypes.AKELIUSINVEST;
@@ -80,14 +78,11 @@ public class AkeliusInvest extends Bank {
public AkeliusInvest(Context context) {
super(context, R.drawable.logo_akeliusinvest);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
}
public AkeliusInvest(String username, String password, Context context) throws BankException,
@@ -137,6 +132,16 @@ public class AkeliusInvest extends Bank {
return urlopen;
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
@Override
public void update() throws BankException, LoginException, BankChoiceException, IOException {
super.update();
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusSpar.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusSpar.java
index 038f0fe..715515e 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusSpar.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AkeliusSpar.java
@@ -47,8 +47,6 @@ public class AkeliusSpar extends Bank {
private static final String NAME = "Akelius Spar";
- private static final String NAME_SHORT = "akeliusspar";
-
private static final String URL = "https://www.online.akeliusspar.se/";
private static final int BANKTYPE_ID = IBankTypes.AKELIUSSPAR;
@@ -81,14 +79,21 @@ public class AkeliusSpar extends Bank {
public AkeliusSpar(Context context) {
super(context, R.drawable.logo_akeliusspar);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public AkeliusSpar(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AppeakPoker.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AppeakPoker.java
index 4940fed..fd2e258 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AppeakPoker.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AppeakPoker.java
@@ -42,8 +42,6 @@ public class AppeakPoker extends Bank {
private static final String NAME = "Appeak Poker";
- private static final String NAME_SHORT = "appeakpoker";
-
private static final String URL = "http://poker.appeak.se/";
private static final int BANKTYPE_ID = Bank.APPEAKPOKER;
@@ -56,16 +54,23 @@ public class AppeakPoker extends Bank {
public AppeakPoker(Context context) {
super(context, R.drawable.logo_appeakpoker);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HIDDEN_PASSWORD = INPUT_HIDDEN_PASSWORD;
- super.DISPLAY_DECIMALS = false;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHiddenPassword = INPUT_HIDDEN_PASSWORD;
+ super.displayDecimals = false;
currency = "chips";
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public AppeakPoker(String username, String password, Context context) throws BankException,
LoginException, BankChoiceException, IOException {
this(context);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AvanzaMini.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AvanzaMini.java
index cc859ac..5f7889b 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AvanzaMini.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/AvanzaMini.java
@@ -26,9 +26,16 @@ public class AvanzaMini extends Avanza {
public AvanzaMini(Context context) {
super(context, R.drawable.logo_avanzamini);
- NAME = "Avanza Mini";
- NAME_SHORT = "avanzamini";
- URL = "https://www.avanza.se/mini/hem/";
- BANKTYPE_ID = IBankTypes.AVANZAMINI;
+ url = "https://www.avanza.se/mini/hem/";
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return IBankTypes.AVANZAMINI;
+ }
+
+ @Override
+ public String getName() {
+ return "Avanza Mini";
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BetterGlobe.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BetterGlobe.java
index eb46cac..536aafb 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BetterGlobe.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BetterGlobe.java
@@ -44,8 +44,6 @@ public class BetterGlobe extends Bank {
private static final String NAME = "Better Globe";
- private static final String NAME_SHORT = "betterglobe";
-
private static final String URL = "http://betterglobe.com";
private static final int BANKTYPE_ID = IBankTypes.BETTERGLOBE;
@@ -70,17 +68,24 @@ public class BetterGlobe extends Bank {
public BetterGlobe(Context context) {
super(context, R.drawable.logo_betterglobe);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
super.currency = "EUR";
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public BetterGlobe(String username, String password, Context context) throws BankException,
LoginException, BankChoiceException, IOException {
this(context);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java
index df9e368..55336d7 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java
@@ -46,8 +46,6 @@ public class Bioklubben extends Bank {
private static final String NAME = "Bioklubben";
- private static final String NAME_SHORT = "bioklubben";
-
private static final String URL = "https://bioklubben.sf.se/Start.aspx";
private static final int BANKTYPE_ID = Bank.BIOKLUBBEN;
@@ -58,17 +56,24 @@ public class Bioklubben extends Bank {
public Bioklubben(Context context) {
super(context, R.drawable.logo_bioklubben);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.DISPLAY_DECIMALS = DISPLAY_DECIMALS;
- super.INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_TEXT
+ super.url = URL;
+ super.displayDecimals = DISPLAY_DECIMALS;
+ super.inputTypeUsername = InputType.TYPE_CLASS_TEXT
| +InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
- super.INPUT_HINT_USERNAME = context.getString(R.string.email);
+ super.inputHintUsername = context.getString(R.string.email);
currency = context.getString(R.string.points);
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public Bioklubben(String username, String password, Context context) throws BankException,
LoginException, BankChoiceException, IOException {
this(context);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BlekingeTrafiken.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BlekingeTrafiken.java
index 62d977f..d2af51a 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BlekingeTrafiken.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BlekingeTrafiken.java
@@ -42,8 +42,6 @@ public class BlekingeTrafiken extends Bank {
private static final String NAME = "Blekingetrafiken";
- private static final String NAME_SHORT = "blekingetrafiken";
-
private static final String URL = "https://www.blekingetrafiken.se";
private static final int BANKTYPE_ID = IBankTypes.BLEKINGETRAFIKEN;
@@ -52,15 +50,21 @@ public class BlekingeTrafiken extends Bank {
public BlekingeTrafiken(Context context) {
super(context, R.drawable.logo_blekingetrafiken);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_PHONE;
- super.INPUT_HINT_USERNAME = "XXXXXXXXXX";
- super.INPUT_TITLETEXT_USERNAME = R.string.card_number;
- super.INPUT_HIDDEN_PASSWORD = true;
+ super.url = URL;
+ super.inputTypeUsername = InputType.TYPE_CLASS_PHONE;
+ super.inputHintUsername = "XXXXXXXXXX";
+ super.inputTitletextUsername = R.string.card_number;
+ super.inputHiddenPassword = true;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+ @Override
+ public String getName() {
+ return NAME;
}
public BlekingeTrafiken(String username, String password, Context context)
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bredband2VoIP.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bredband2VoIP.java
index 60145b8..309ee6a 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bredband2VoIP.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bredband2VoIP.java
@@ -63,11 +63,18 @@ public class Bredband2VoIP extends Bank {
public Bredband2VoIP(Context context) {
super(context, R.drawable.logo_bredband2voip);
- NAME = "Bredband2 VoIP";
- NAME_SHORT = "bredband2voip";
- BANKTYPE_ID = IBankTypes.BREDBAND2VOIP;
- super.INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_PHONE;
- super.INPUT_HINT_USERNAME = "19XXXXXX-XXXX";
+ super.inputTypeUsername = InputType.TYPE_CLASS_PHONE;
+ super.inputHintUsername = "19XXXXXX-XXXX";
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return IBankTypes.BREDBAND2VOIP;
+ }
+
+ @Override
+ public String getName() {
+ return "Bredband2 VoIP";
}
public Bredband2VoIP(String username, String password, Context context)
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BrummerKF.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BrummerKF.java
index 7c35408..c821869 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BrummerKF.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/BrummerKF.java
@@ -46,8 +46,6 @@ public class BrummerKF extends Bank {
private static final String NAME = "Brummer KF & Pension";
- private static final String NAME_SHORT = "brummer_kf";
-
private static final String URL = "https://www.brummer.se/";
private static final int BANKTYPE_ID = IBankTypes.BRUMMER_KF;
@@ -78,14 +76,21 @@ public class BrummerKF extends Bank {
public BrummerKF(Context context) {
super(context, R.drawable.logo_brummer_kf);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public BrummerKF(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/CSN.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/CSN.java
index 3640850..1ba7084 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/CSN.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/CSN.java
@@ -49,8 +49,6 @@ public class CSN extends Bank {
private static final String NAME = "CSN";
- private static final String NAME_SHORT = "csn";
-
private static final String URL = "https://www.csn.se/bas/inloggning/pinkod.do";
private static final int BANKTYPE_ID = IBankTypes.CSN;
@@ -82,14 +80,21 @@ public class CSN extends Bank {
public CSN(Context context) {
super(context, R.drawable.logo_csn);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public CSN(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Chalmrest.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Chalmrest.java
index 5276b57..d59b8f2 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Chalmrest.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Chalmrest.java
@@ -28,8 +28,6 @@ public class Chalmrest extends Bank {
private static final String NAME = "Chalmrest";
- private static final String NAME_SHORT = "chalmrest";
-
private static final int BANKTYPE_ID = IBankTypes.CHALMREST;
private Pattern reViewState = Pattern.compile("__VIEWSTATE\"\\s+value=\"([^\"]+)\"");
@@ -47,13 +45,20 @@ public class Chalmrest extends Bank {
public Chalmrest(Context context) {
super(context, R.drawable.logo_chalmrest);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.INPUT_TITLETEXT_USERNAME = R.string.card_number;
- super.INPUT_HINT_USERNAME = "XXXXXXXXXXXXXXXX";
- super.INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_NUMBER;
- super.INPUT_HIDDEN_PASSWORD = true;
+ super.inputTitletextUsername = R.string.card_number;
+ super.inputHintUsername = "XXXXXXXXXXXXXXXX";
+ super.inputTypeUsername = InputType.TYPE_CLASS_NUMBER;
+ super.inputHiddenPassword = true;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Chalmrest(String username, String password, Context context) throws BankException,
@@ -110,30 +115,30 @@ public class Chalmrest extends Bank {
}
urlopen = login();
response = urlopen.open("http://kortladdning3.chalmerskonferens.se/CardLoad_Order.aspx");
- Matcher matcher;
- Matcher matcher_b;
+ Matcher accountMatcher;
+ Matcher balanceMatcher;
- matcher = reAccount.matcher(response);
- if (matcher.find()) {
+ accountMatcher = reAccount.matcher(response);
+ if (accountMatcher.find()) {
/*
* Capture groups:
* GROUP EXAMPLE DATA
* 1: Name Kalle Karlsson
*/
- matcher_b = reBalance.matcher(response);
- if (matcher_b.find()) {
+ balanceMatcher = reBalance.matcher(response);
+ if (balanceMatcher.find()) {
/*
* Capture groups:
* GROUP EXAMPLE DATA
* 1: Balance 118 kr
*/
- String balanceString = matcher_b.group(1).replaceAll("\\]*>", "")
+ String balanceString = balanceMatcher.group(1).replaceAll("\\]*>", "")
.replaceAll("\\<[^>]*>", "").trim();
- accounts.add(new Account(Html.fromHtml(matcher.group(1)).toString().trim(),
- Helpers.parseBalance(balanceString), matcher.group(1)));
+ accounts.add(new Account(Html.fromHtml(accountMatcher.group(1)).toString().trim(),
+ Helpers.parseBalance(balanceString), accountMatcher.group(1)));
balance = balance.add(Helpers.parseBalance(balanceString));
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/DanskeBank.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/DanskeBank.java
index af8c51f..4f5e687 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/DanskeBank.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/DanskeBank.java
@@ -49,8 +49,6 @@ public class DanskeBank extends Bank {
private static final String NAME = "DanskeBank";
- private static final String NAME_SHORT = "danskebank";
-
private static final String URL
= "https://mobil.danskebank.se/XI?WP=XAI&WO=Logon&WA=MBSELogon&gsSprog=SE&gsBrand=OEB";
@@ -82,13 +80,20 @@ public class DanskeBank extends Bank {
public DanskeBank(Context context) {
super(context, R.drawable.logo_danskebank);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public DanskeBank(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Everydaycard.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Everydaycard.java
index 729c222..0e2046d 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Everydaycard.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Everydaycard.java
@@ -45,8 +45,6 @@ public class Everydaycard extends Bank {
private static final String NAME = "Everydaycard";
- private static final String NAME_SHORT = "everydaycard";
-
private static final String URL = "http://www.everydaycard.se/mobil/";
private static final int BANKTYPE_ID = IBankTypes.EVERYDAYCARD;
@@ -67,12 +65,19 @@ public class Everydaycard extends Bank {
public Everydaycard(Context context) {
super(context, R.drawable.logo_everydaycard);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Everydaycard(String username, String password, Context context)
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/FirstCard.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/FirstCard.java
index 90a513c..cb8b9a4 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/FirstCard.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/FirstCard.java
@@ -46,8 +46,6 @@ public class FirstCard extends Bank {
private static final String NAME = "First Card";
- private static final String NAME_SHORT = "firstcard";
-
private static final String URL = "https://www.firstcard.se/login.jsp";
private static final int BANKTYPE_ID = IBankTypes.FIRSTCARD;
@@ -68,12 +66,19 @@ public class FirstCard extends Bank {
public FirstCard(Context context) {
super(context, R.drawable.logo_firstcard);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public FirstCard(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hemkop.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hemkop.java
index 8d97593..688d147 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hemkop.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hemkop.java
@@ -50,8 +50,6 @@ public class Hemkop extends Bank {
private static final String NAME = "Hemköp Kundkort";
- private static final String NAME_SHORT = "hemkop";
-
private static final String URL = "https://www.hemkop.se/Mina-sidor/Logga-in/";
private static final int BANKTYPE_ID = IBankTypes.HEMKOP;
@@ -65,12 +63,19 @@ public class Hemkop extends Bank {
public Hemkop(Context context) {
super(context, R.drawable.logo_hemkop);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Hemkop(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hors.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hors.java
index 0930038..3fed434 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hors.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Hors.java
@@ -45,8 +45,6 @@ public class Hors extends Bank {
private static final String NAME = "Hörs";
- private static final String NAME_SHORT = "hors";
-
private static final String URL = "http://www.dittkort.se/hors/";
private static final int BANKTYPE_ID = IBankTypes.HORS;
@@ -58,15 +56,22 @@ public class Hors extends Bank {
public Hors(Context context) {
super(context, R.drawable.logo_hors);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.DISPLAY_DECIMALS = DISPLAY_DECIMALS;
- super.INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_TEXT
+ super.url = URL;
+ super.displayDecimals = DISPLAY_DECIMALS;
+ super.inputTypeUsername = InputType.TYPE_CLASS_TEXT
| +InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
- super.INPUT_HINT_USERNAME = context.getString(R.string.card_id);
- super.INPUT_HIDDEN_PASSWORD = true;
+ super.inputHintUsername = context.getString(R.string.card_id);
+ super.inputHiddenPassword = true;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Hors(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IKEA.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IKEA.java
index 3677f55..85255d6 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IKEA.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IKEA.java
@@ -30,8 +30,6 @@ public class IKEA extends AbsIkanoPartner {
private static final String NAME = "IKEA HANDLA kort";
- private static final String NAME_SHORT = "ikea";
-
private static final String URL
= "https://partner.ikanobank.se/web/engines/page.aspx?structid=1420";
@@ -40,13 +38,20 @@ public class IKEA extends AbsIkanoPartner {
public IKEA(Context context) {
super(context, R.drawable.logo_ikea);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
+ super.url = URL;
this.structId = "1420";
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public IKEA(String username, String password, Context context) throws BankException,
LoginException, BankChoiceException, IOException {
this(context);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IkanoBank.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IkanoBank.java
index 9ea837a..b8de01c 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IkanoBank.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/IkanoBank.java
@@ -47,8 +47,6 @@ public class IkanoBank extends Bank {
private static final String NAME = "Ikano Bank";
- private static final String NAME_SHORT = "ikanobank";
-
private static final String URL = "https://secure.ikanobank.se/engines/page.aspx?structid=1895";
private static final int BANKTYPE_ID = IBankTypes.IKANOBANK;
@@ -81,13 +79,20 @@ public class IkanoBank extends Bank {
public IkanoBank(Context context) {
super(context, R.drawable.logo_ikanobank);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public IkanoBank(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java
index fddf1bb..0b1d3ed 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java
@@ -48,8 +48,6 @@ public class Jojo extends Bank {
private static final String NAME = "Jojo Reskassa";
- private static final String NAME_SHORT = "jojo";
-
private static final String URL = "https://www.skanetrafiken.se";
private static final int BANKTYPE_ID = IBankTypes.JOJO;
@@ -64,12 +62,19 @@ public class Jojo extends Bank {
public Jojo(Context context) {
super(context, R.drawable.logo_jojo);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TITLETEXT_USERNAME = R.string.email;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
+ super.url = URL;
+ super.inputTitletextUsername = R.string.email;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Jojo(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/McDonalds.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/McDonalds.java
index 1aeefd3..2fb50b7 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/McDonalds.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/McDonalds.java
@@ -45,8 +45,6 @@ public class McDonalds extends Bank {
private static final String NAME = "McDonald's Presentkort";
- private static final String NAME_SHORT = "mcdonalds";
-
private static final String URL = "http://apps.mcdonalds.se/sweden/giftquer.nsf/egift?OpenForm";
private static final int BANKTYPE_ID = Bank.MCDONALDS;
@@ -67,13 +65,20 @@ public class McDonalds extends Bank {
public McDonalds(Context context) {
super(context, R.drawable.logo_mcdonalds);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HIDDEN_PASSWORD = INPUT_HIDDEN_PASSWORD;
- super.INPUT_TITLETEXT_USERNAME = INPUT_TITLETEXT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHiddenPassword = INPUT_HIDDEN_PASSWORD;
+ super.inputTitletextUsername = INPUT_TITLETEXT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public McDonalds(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Meniga.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Meniga.java
index 9b20da6..c383409 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Meniga.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Meniga.java
@@ -32,8 +32,6 @@ public class Meniga extends Bank {
private static final String NAME = "Meniga";
- private static final String NAME_SHORT = "meniga";
-
private static final String URL = "https://www.meniga.is/";
private static final int BANKTYPE_ID = IBankTypes.MENIGA;
@@ -53,15 +51,22 @@ public class Meniga extends Bank {
public Meniga(Context context) {
super(context, R.drawable.logo_meniga);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
super.setCurrency("ISK");
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public Meniga(String username, String password, Context context) throws BankException,
LoginException, BankChoiceException, IOException {
this(context);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/MinPension.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/MinPension.java
index b6f3cbb..ab68bfa 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/MinPension.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/MinPension.java
@@ -48,13 +48,19 @@ public class MinPension extends Bank {
public MinPension(Context context) {
super(context, R.drawable.logo_minpension);
- TAG = "MinPension";
- NAME = "Min Pension.se";
- NAME_SHORT = "minpension";
- BANKTYPE_ID = IBankTypes.MINPENSION;
- INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_PHONE;
- INPUT_TYPE_PASSWORD = InputType.TYPE_CLASS_PHONE | InputType.TYPE_TEXT_VARIATION_PASSWORD;
- INPUT_HINT_USERNAME = res.getText(R.string.pno).toString();
+ inputTypeUsername = InputType.TYPE_CLASS_PHONE;
+ inputTypePassword = InputType.TYPE_CLASS_PHONE | InputType.TYPE_TEXT_VARIATION_PASSWORD;
+ inputHintUsername = res.getText(R.string.pno).toString();
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return IBankTypes.MINPENSION;
+ }
+
+ @Override
+ public String getName() {
+ return "Min Pension.se";
}
public MinPension(String username, String password, Context context)
@@ -128,8 +134,8 @@ public class MinPension extends Bank {
super.updateComplete();
}
- private Account updateAccount(String URL, String selector, String name) throws IOException {
- String response = urlopen.open(URL);
+ private Account updateAccount(String url, String selector, String name) throws IOException {
+ String response = urlopen.open(url);
Document dResponse = Jsoup.parse(response);
List transactions = new ArrayList<>();
String institute = "";
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Nordnet.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Nordnet.java
index 7552aa9..8925dc6 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Nordnet.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Nordnet.java
@@ -48,8 +48,6 @@ public class Nordnet extends Bank {
private static final String NAME = "Nordnet";
- private static final String NAME_SHORT = "nordnet";
-
private static final String URL = "https://www.nordnet.se/mux/login/startSE.html";
private static final int BANKTYPE_ID = IBankTypes.NORDNET;
@@ -66,10 +64,17 @@ public class Nordnet extends Bank {
public Nordnet(Context context) {
super(context, R.drawable.logo_nordnet);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
+ super.url = URL;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Nordnet(String username, String password, Context context) throws BankException,
@@ -128,32 +133,32 @@ public class Nordnet extends Bank {
throw new LoginException(res.getText(R.string.invalid_username_password).toString());
}
urlopen = login();
- Matcher matcher = reAccounts.matcher(response);
- Matcher matcher_b = reBalance.matcher(response);
- while (matcher.find()) {
+ Matcher accountMatcher = reAccounts.matcher(response);
+ Matcher balanceMatcher = reBalance.matcher(response);
+ while (accountMatcher.find()) {
/*
* Capture groups:
* GROUP EXAMPLE DATA
* 1: Account name and number Investeringssparkonto 1234567 | Sparkonto 1234 567890 1
*
*/
- if (matcher_b.find()) {
+ if (balanceMatcher.find()) {
/*
* Capture groups:
* GROUP EXAMPLE DATA
* 1: Account balance 62 356 | 0
*
*/
- Account account = new Account(Html.fromHtml(matcher.group(1)).toString().trim(),
- Helpers.parseBalance(matcher_b.group(1)),
- Html.fromHtml(matcher.group(1)).toString().trim().replaceAll(" ", ""));
+ Account account = new Account(Html.fromHtml(accountMatcher.group(1)).toString().trim(),
+ Helpers.parseBalance(balanceMatcher.group(1)),
+ Html.fromHtml(accountMatcher.group(1)).toString().trim().replaceAll(" ", ""));
// Saving accounts contain white space characters in the account number
- if (!matcher.group(1).trim().contains(" ")) {
+ if (!accountMatcher.group(1).trim().contains(" ")) {
account.setType(Account.FUNDS);
}
accounts.add(account);
- balance = balance.add(Helpers.parseBalance(matcher_b.group(1)));
+ balance = balance.add(Helpers.parseBalance(balanceMatcher.group(1)));
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java
index c7fa006..540abd3 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java
@@ -47,8 +47,6 @@ public class OKQ8 extends Bank {
private static final String NAME = "OKQ8 VISA";
- private static final String NAME_SHORT = "okq8";
-
private static final String URL
= "https://nettbank.edb.com/Logon/index.jsp?domain=0066&from_page=http://www.okq8.se&to_page=https://nettbank.edb.com/cardpayment/transigo/logon/done/okq8";
@@ -76,13 +74,20 @@ public class OKQ8 extends Bank {
public OKQ8(Context context) {
super(context, R.drawable.logo_okq8);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public OKQ8(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java
index 8524e38..d017230 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java
@@ -43,8 +43,6 @@ public class Ostgotatrafiken extends Bank {
private static final String NAME = "Östgötatrafiken";
- private static final String NAME_SHORT = "ogt";
-
private static final int BANKTYPE_ID = IBankTypes.OSTGOTATRAFIKEN;
private Pattern reViewState = Pattern.compile(
@@ -68,10 +66,16 @@ public class Ostgotatrafiken extends Bank {
public Ostgotatrafiken(Context context) {
super(context, R.drawable.logo_ogt);
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
+ @Override
+ public String getName() {
+ return NAME;
}
public Ostgotatrafiken(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Osuuspankki.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Osuuspankki.java
index c597d44..f62b92a 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Osuuspankki.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Osuuspankki.java
@@ -45,8 +45,6 @@ public class Osuuspankki extends Bank {
private static final String NAME = "Osuuspankki";
- private static final String NAME_SHORT = "osuuspankki";
-
private static final String URL = "https://www.op.fi/op?kielikoodi=sv";
private static final int BANKTYPE_ID = IBankTypes.OSUUSPANKKI;
@@ -62,11 +60,17 @@ public class Osuuspankki extends Bank {
public Osuuspankki(Context context) {
super(context, R.drawable.logo_osuuspankki);
+ super.url = URL;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
+ @Override
+ public String getName() {
+ return NAME;
}
public Osuuspankki(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java
index f90ae79..d98a263 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java
@@ -46,8 +46,6 @@ public class Payson extends Bank {
private static final String NAME = "Payson";
- private static final String NAME_SHORT = "payson";
-
private static final String URL = "https://www.payson.se/signin/";
private static final int BANKTYPE_ID = IBankTypes.PAYSON;
@@ -66,11 +64,18 @@ public class Payson extends Bank {
public Payson(Context context) {
super(context, R.drawable.logo_payson);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Payson(String username, String password, Context context) throws BankChoiceException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/PlusGirot.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/PlusGirot.java
index a4da2e4..8e1ee5b 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/PlusGirot.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/PlusGirot.java
@@ -45,8 +45,6 @@ public class PlusGirot extends Bank {
private static final String NAME = "PlusGirot";
- private static final String NAME_SHORT = "plusgirot";
-
private static final String URL = "https://kontoutdrag.plusgirot.se/";
private static final int BANKTYPE_ID = IBankTypes.PLUSGIROT;
@@ -63,11 +61,17 @@ public class PlusGirot extends Bank {
public PlusGirot(Context context) {
super(context, R.drawable.logo_plusgirot);
+ super.url = URL;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
+ @Override
+ public String getName() {
+ return NAME;
}
public PlusGirot(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SevenDay.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SevenDay.java
index 490046a..9990b50 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SevenDay.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SevenDay.java
@@ -45,8 +45,6 @@ public class SevenDay extends Bank {
private static final String NAME = "SevenDay";
- private static final String NAME_SHORT = "sevenday";
-
private static final String URL = "https://www.sevenday.se/mina-sidor/mina-sidor.htm";
private static final int BANKTYPE_ID = IBankTypes.SEVENDAY;
@@ -67,12 +65,19 @@ public class SevenDay extends Bank {
public SevenDay(Context context) {
super(context, R.drawable.logo_sevenday);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public SevenDay(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java
index 9aef3df..2a3566d 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java
@@ -32,8 +32,6 @@ public class SveaDirekt extends Bank {
private static final String NAME = "Svea Direkt";
- private static final String NAME_SHORT = "sveadirekt";
-
private static final String URL = "https://http://www.sveadirekt.com/sv/swe//";
private static final int BANKTYPE_ID = IBankTypes.SVEADIREKT;
@@ -61,13 +59,20 @@ public class SveaDirekt extends Bank {
public SveaDirekt(Context context) {
super(context, R.drawable.logo_sveadirekt);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.URL = URL;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public SveaDirekt(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SvenskaSpel.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SvenskaSpel.java
index 85d795c..b81cdc2 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SvenskaSpel.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SvenskaSpel.java
@@ -45,8 +45,6 @@ public class SvenskaSpel extends Bank {
private static final String NAME = "Svenska Spel";
- private static final String NAME_SHORT = "svenskaspel";
-
private static final String URL = "https://api.www.svenskaspel.se/player/sessions";
private static final int BANKTYPE_ID = Bank.SVENSKASPEL;
@@ -62,12 +60,19 @@ public class SvenskaSpel extends Bank {
public SvenskaSpel(Context context) {
super(context, R.drawable.logo_svenskaspel);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TITLETEXT_USERNAME = INPUT_TITLETEXT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTitletextUsername = INPUT_TITLETEXT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public SvenskaSpel(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TestBank.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TestBank.java
index 2ceec08..a3c3a5e 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TestBank.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TestBank.java
@@ -43,8 +43,6 @@ public class TestBank extends Bank {
private static final String NAME = "Testbank";
- private static final String NAME_SHORT = "testbank";
-
private static final String URL = "http://www.nullbyte.eu/";
private static final int BANKTYPE_ID = IBankTypes.TESTBANK;
@@ -70,13 +68,20 @@ public class TestBank extends Bank {
public TestBank(Context context) {
super(context, R.drawable.logo_bankdroid);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public TestBank(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TicketRikskortet.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TicketRikskortet.java
index ed68966..2c370fa 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TicketRikskortet.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/TicketRikskortet.java
@@ -44,8 +44,6 @@ public class TicketRikskortet extends Bank {
private static final String NAME = "Ticket Rikskortet";
- private static final String NAME_SHORT = "rikskortet";
-
private static final String URL = "https://www.edenred.se/rikskuponger/mina-sidor/logga-in/";
private static final String URL_OVERVIEW = "https://www.edenred.se/rikskuponger/mina-sidor/employee/start/";
@@ -71,10 +69,17 @@ public class TicketRikskortet extends Bank {
public TicketRikskortet(Context context) {
super(context, R.drawable.logo_rikskortet);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
+ super.url = URL;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public TicketRikskortet(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Vasttrafik.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Vasttrafik.java
index 3c51255..0668464 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Vasttrafik.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Vasttrafik.java
@@ -44,8 +44,6 @@ public class Vasttrafik extends Bank {
private static final String NAME = "Västtrafik";
- private static final String NAME_SHORT = "vasttrafik";
-
private static final String URL = "https://www.vasttrafik.se/mina-sidor/";
private static final int BANKTYPE_ID = IBankTypes.VASTTRAFIK;
@@ -64,11 +62,17 @@ public class Vasttrafik extends Bank {
public Vasttrafik(Context context) {
super(context, R.drawable.logo_vasttrafik);
+ super.url = URL;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
+ @Override
+ public String getName() {
+ return NAME;
}
public Vasttrafik(String username, String password, Context context) throws BankException,
@@ -127,11 +131,11 @@ public class Vasttrafik extends Bank {
}
urlopen = login();
response = urlopen.open("https://www.vasttrafik.se/mina-sidor-inloggad/mina-kort/");
- Matcher matcher;
- Matcher matcher_b;
+ Matcher accountMatcher;
+ Matcher balanceMatcher;
- matcher = reAccounts.matcher(response);
- while (matcher.find()) {
+ accountMatcher = reAccounts.matcher(response);
+ while (accountMatcher.find()) {
/*
* Capture groups:
* GROUP EXAMPLE DATA
@@ -139,12 +143,12 @@ public class Vasttrafik extends Bank {
* 2: Balance information
*/
- if ("".equals(matcher.group(1))) {
+ if ("".equals(accountMatcher.group(1))) {
continue;
}
- matcher_b = reBalance.matcher(matcher.group(2));
- if (matcher_b.find()) {
+ balanceMatcher = reBalance.matcher(accountMatcher.group(2));
+ if (balanceMatcher.find()) {
/*
* Capture groups:
* GROUP EXAMPLE DATA
@@ -152,11 +156,11 @@ public class Vasttrafik extends Bank {
* 2: Amount 592,80 kr
*/
- String balanceString = matcher_b.group(2).replaceAll("\\]*>", "")
+ String balanceString = balanceMatcher.group(2).replaceAll("\\]*>", "")
.replaceAll("\\<[^>]*>", "").trim();
- accounts.add(new Account(Html.fromHtml(matcher.group(1)).toString().trim(),
- Helpers.parseBalance(balanceString), matcher.group(1)));
+ accounts.add(new Account(Html.fromHtml(accountMatcher.group(1)).toString().trim(),
+ Helpers.parseBalance(balanceString), accountMatcher.group(1)));
balance = balance.add(Helpers.parseBalance(balanceString));
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Zidisha.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Zidisha.java
index a7b13e1..ab4cef3 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Zidisha.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Zidisha.java
@@ -44,8 +44,6 @@ public class Zidisha extends Bank {
private static final String NAME = "Zidisha";
- private static final String NAME_SHORT = "zidisha";
-
private static final String URL = "https://www.zidisha.org/";
private static final int BANKTYPE_ID = IBankTypes.ZIDISHA;
@@ -70,17 +68,24 @@ public class Zidisha extends Bank {
public Zidisha(Context context) {
super(context, R.drawable.logo_zidisha);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ super.staticBalance = STATIC_BALANCE;
super.currency = "USD";
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public Zidisha(String username, String password, Context context) throws BankException,
LoginException, BankChoiceException, IOException {
this(context);
@@ -99,14 +104,14 @@ public class Zidisha extends Bank {
throw new BankException(
res.getText(R.string.unable_to_find).toString() + " user_guess.");
}
- String user_guess = mUserGuess.group(1);
+ String userGuess = mUserGuess.group(1);
List postData = new ArrayList();
postData.add(new BasicNameValuePair("username", getUsername()));
postData.add(new BasicNameValuePair("password", getPassword()));
postData.add(new BasicNameValuePair("textpassword", getUsername()));
postData.add(new BasicNameValuePair("userlogin", ""));
- postData.add(new BasicNameValuePair("user_guess", user_guess));
+ postData.add(new BasicNameValuePair("user_guess", userGuess));
return new LoginPackage(urlopen, postData, response, "https://www.zidisha.org/process.php");
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java
index 933ec1f..c853116 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java
@@ -52,12 +52,8 @@ import eu.nullbyte.android.urllib.Urllib;
public class AmericanExpress extends Bank {
- private static final String TAG = "AmericanExpress";
-
private static final String NAME = "American Express";
- private static final String NAME_SHORT = "americanexpress";
-
private static final int BANKTYPE_ID = IBankTypes.AMERICANEXPRESS;
private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -67,11 +63,17 @@ public class AmericanExpress extends Bank {
public AmericanExpress(Context context) {
super(context, R.drawable.logo_americanexpress);
- super.TAG = TAG;
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.WEB_VIEW_ENABLED = false;
+ super.webViewEnabled = false;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public AmericanExpress(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java
index 1e6bf30..3d3aa64 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java
@@ -57,11 +57,17 @@ public class Avanza extends Bank {
protected Avanza(Context context, @DrawableRes int logoResource) {
super(context, logoResource);
- TAG = "Avanza";
- NAME = "Avanza";
- NAME_SHORT = "avanza";
- URL = "https://iphone.avanza.se";
- BANKTYPE_ID = IBankTypes.AVANZA;
+ url = "https://iphone.avanza.se";
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return IBankTypes.AVANZA;
+ }
+
+ @Override
+ public String getName() {
+ return "Avanza";
}
public Avanza(Context context) {
@@ -72,12 +78,12 @@ public class Avanza extends Bank {
protected LoginPackage preLogin() throws BankException, IOException {
urlopen = new Urllib(context,
CertificateReader.getCertificates(context, R.raw.cert_avanza));
- urlopen.addHeader("Referer", URL + "/start");
+ urlopen.addHeader("Referer", url + "/start");
List postData = new ArrayList();
postData.add(new BasicNameValuePair("j_username", getUsername()));
postData.add(new BasicNameValuePair("j_password", getPassword()));
- postData.add(new BasicNameValuePair("url", URL + "/start"));
- String response = urlopen.open(URL + "/ab/handlelogin", postData);
+ postData.add(new BasicNameValuePair("url", url + "/start"));
+ String response = urlopen.open(url + "/ab/handlelogin", postData);
String homeUrl = "";
try {
JSONObject jsonResponse = new JSONObject(response);
@@ -86,7 +92,7 @@ public class Avanza extends Bank {
throw new BankException(
res.getText(R.string.unable_to_find).toString() + " login link.", e);
}
- LoginPackage lp = new LoginPackage(urlopen, postData, "", URL + homeUrl);
+ LoginPackage lp = new LoginPackage(urlopen, postData, "", url + homeUrl);
lp.setIsLoggedIn(true);
return lp;
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java
index c726896..9efdf1d 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java
@@ -40,8 +40,6 @@ public class Bitcoin extends Bank {
private static final String NAME = "Bitcoin";
- private static final String NAME_SHORT = "bitcoin";
-
private static final String URL = "http://blockchain.info";
private static final int BANKTYPE_ID = IBankTypes.BITCOIN;
@@ -59,14 +57,21 @@ public class Bitcoin extends Bank {
public Bitcoin(Context context) {
super(context, R.drawable.logo_bitcoin);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.STATIC_BALANCE = STATIC_BALANCE;
+ super.url = URL;
+ super.staticBalance = STATIC_BALANCE;
super.currency = "BTC";
- super.INPUT_HIDDEN_PASSWORD = INPUT_HIDDEN_PASSWORD;
- super.INPUT_TITLETEXT_USERNAME = INPUT_TITLETEXT_USERNAME;
+ super.inputHiddenPassword = INPUT_HIDDEN_PASSWORD;
+ super.inputTitletextUsername = INPUT_TITLETEXT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Bitcoin(String username, String password, Context context)
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java
index 1ac76d6..7c27950 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java
@@ -57,8 +57,6 @@ public class Coop extends Bank {
private static final String NAME = "Coop";
- private static final String NAME_SHORT = "coop";
-
private static final String URL = "https://www.coop.se/mina-sidor/oversikt/";
private static final int BANKTYPE_ID = IBankTypes.COOP;
@@ -83,11 +81,18 @@ public class Coop extends Bank {
public Coop(Context context) {
super(context, R.drawable.logo_coop);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.STATIC_BALANCE = true;
+ super.url = URL;
+ super.staticBalance = true;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Coop(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/ica/ICA.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/ica/ICA.java
index ffc18a5..ebdb705 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/ica/ICA.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/ica/ICA.java
@@ -66,19 +66,25 @@ public class ICA extends Bank {
public ICA(Context context) {
super(context, R.drawable.logo_ica);
- TAG = "ICA";
- NAME = "ICA";
- NAME_SHORT = "ica";
- URL = "http://mobil.ica.se/";
- BANKTYPE_ID = IBankTypes.ICA;
- INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_PHONE;
- INPUT_TYPE_PASSWORD = InputType.TYPE_CLASS_PHONE;
- INPUT_HINT_USERNAME = "Ã…Ã…MMDDXXXX";
+ url = "http://mobil.ica.se/";
+ inputTypeUsername = InputType.TYPE_CLASS_PHONE;
+ inputTypePassword = InputType.TYPE_CLASS_PHONE;
+ inputHintUsername = "Ã…Ã…MMDDXXXX";
mHeaders.put(AUTHENTICATION_TICKET_HEADER, null);
mHeaders.put(SESSION_TICKET_HEADER, null);
mHeaders.put(LOGOUT_KEY_HEADER, null);
}
+ @Override
+ public int getBanktypeId() {
+ return IBankTypes.ICA;
+ }
+
+ @Override
+ public String getName() {
+ return "ICA";
+ }
+
public ICA(String username, String password, Context context)
throws BankException, LoginException, BankChoiceException, IOException {
this(context);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
index b825abf..97e4b46 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
@@ -64,8 +64,6 @@ public class Lansforsakringar extends Bank {
private static final String NAME = "Länsförsäkringar";
- private static final String NAME_SHORT = "lansforsakringar";
-
private static final int BANKTYPE_ID = IBankTypes.LANSFORSAKRINGAR;
private static final int INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_PHONE;
@@ -83,17 +81,24 @@ public class Lansforsakringar extends Bank {
public Lansforsakringar(Context context) {
super(context, R.drawable.logo_lansforsakringar);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
mObjectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
mObjectMapper.configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, false);
mObjectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
}
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
public Urllib login() throws LoginException, BankException, IOException {
urlopen = new Urllib(context,
CertificateReader.getCertificates(context, R.raw.cert_lansforsakringar));
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/nordea/Nordea.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/nordea/Nordea.java
index 24dbb7e..cf8dd19 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/nordea/Nordea.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/nordea/Nordea.java
@@ -46,8 +46,6 @@ public class Nordea extends Bank {
private static final String NAME = "Nordea";
- private static final String NAME_SHORT = "nordea";
-
private static final String BASE_URL = "https://internetbanken.privat.nordea.se/nsp/";
private static final String LOGIN_URL = BASE_URL + "login";
@@ -210,13 +208,20 @@ public class Nordea extends Bank {
public Nordea(Context context) {
super(context, R.drawable.logo_nordea);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = BASE_URL;
- super.INPUT_TYPE_USERNAME = INPUT_TYPE_USERNAME;
- super.INPUT_TYPE_PASSWORD = INPUT_TYPE_PASSWORD;
- super.INPUT_HINT_USERNAME = INPUT_HINT_USERNAME;
+ super.url = BASE_URL;
+ super.inputTypeUsername = INPUT_TYPE_USERNAME;
+ super.inputTypePassword = INPUT_TYPE_PASSWORD;
+ super.inputHintUsername = INPUT_HINT_USERNAME;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Nordea(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java
index 1d58f40..9b08924 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java
@@ -40,8 +40,6 @@ public class Rikslunchen extends Bank {
private static final String NAME = "Rikslunchen";
- private static final String NAME_SHORT = "rikslunchen";
-
private static final String URL = "http://www.rikslunchen.se/index.html";
private static final int BANKTYPE_ID = Bank.RIKSLUNCHEN;
@@ -53,13 +51,20 @@ public class Rikslunchen extends Bank {
public Rikslunchen(Context context) {
super(context, R.drawable.logo_rikslunchen);
- super.NAME = NAME;
- super.NAME_SHORT = NAME_SHORT;
- super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
- super.INPUT_TYPE_USERNAME = InputType.TYPE_CLASS_PHONE;
- super.INPUT_TITLETEXT_USERNAME = R.string.card_id;
- super.INPUT_HIDDEN_PASSWORD = true;
+ super.url = URL;
+ super.inputTypeUsername = InputType.TYPE_CLASS_PHONE;
+ super.inputTitletextUsername = R.string.card_id;
+ super.inputHiddenPassword = true;
+ }
+
+ @Override
+ public int getBanktypeId() {
+ return BANKTYPE_ID;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
}
public Rikslunchen(String username, String password, Context context) throws BankException,
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
index 2636816..36354b6 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
@@ -88,9 +88,9 @@ import timber.log.Timber;
public class Urllib {
- private static int MAX_RETRIES = 5;
+ private final static int MAX_RETRIES = 5;
- public static String DEFAULT_USER_AGENT
+ public final static String DEFAULT_USER_AGENT
= "Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17";
private String userAgent = null;
diff --git config/quality/lint/lint.xml config/quality/lint/lint.xml
index f81c4ca..8195ce2 100644
--- config/quality/lint/lint.xml
+++ config/quality/lint/lint.xml
@@ -30,7 +30,6 @@
-
diff --git config/quality/pmd/pmd-ruleset.xml config/quality/pmd/pmd-ruleset.xml
index 05b8f94..68eee4b 100644
--- config/quality/pmd/pmd-ruleset.xml
+++ config/quality/pmd/pmd-ruleset.xml
@@ -113,7 +113,6 @@
-
@@ -139,6 +138,5 @@
-
commit e1cbce765867ba88c0bf9c1931a4e47f34dacf44
Author: Johan Walles
Date: Thu Nov 3 21:01:58 2016 +0100
If asked for an unknown bank, log the id
So instead of getting in Crashlytics...
BankType id not found.
... we now get...
BankType id not found: 1234
This way it will be easier to understand why we get these exceptions and
how they should be handled (or not).
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankFactory.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankFactory.java
index d2a8b11..f95ef32 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankFactory.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankFactory.java
@@ -144,7 +144,7 @@ public class LegacyBankFactory {
case IBankTypes.HORS:
return new Hors(context);
default:
- throw new BankException("BankType id not found.");
+ throw new BankException("BankType id not found: " + id);
}
}
commit de72b761b9a9a84ea49fb4036e942b24ca49cd5e
Author: Johan Walles
Date: Thu Nov 3 21:21:31 2016 +0100
Don't lose the stacks when re-throwing exceptions
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java
index 4f2d1ae..f90ae79 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Payson.java
@@ -108,7 +108,7 @@ public class Payson extends Bank {
userInfo = new JSONObject(
urlopen.open("https://www.payson.se/myaccount/user/getuserinfo"));
} catch (JSONException e) {
- throw new LoginException(res.getText(R.string.invalid_username_password).toString());
+ throw new LoginException(res.getText(R.string.invalid_username_password).toString(), e);
}
return urlopen;
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java
index e0ee2d8..1e6bf30 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/avanza/Avanza.java
@@ -84,7 +84,7 @@ public class Avanza extends Bank {
homeUrl = jsonResponse.getString("redirectUrl");
} catch (JSONException e) {
throw new BankException(
- res.getText(R.string.unable_to_find).toString() + " login link.");
+ res.getText(R.string.unable_to_find).toString() + " login link.", e);
}
LoginPackage lp = new LoginPackage(urlopen, postData, "", URL + homeUrl);
lp.setIsLoggedIn(true);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java
index 0f789ff..c726896 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/bitcoin/Bitcoin.java
@@ -96,7 +96,7 @@ public class Bitcoin extends Bank {
setCurrency("BTC");
} catch (JsonParseException e) {
throw new BankException(res.getText(
- R.string.invalid_bitcoin_address).toString());
+ R.string.invalid_bitcoin_address).toString(), e);
}
return urlopen;
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
index 7e8fe82..b825abf 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
@@ -115,7 +115,7 @@ public class Lansforsakringar extends Bank {
objectAsJson(new LoginRequest(getUsername(), getPassword())), LoginResponse.class);
urlopen.addHeader("Utoken", lr.getTicket());
} catch (Exception e) {
- throw new LoginException(res.getText(R.string.invalid_username_password).toString());
+ throw new LoginException(res.getText(R.string.invalid_username_password).toString(), e);
}
return urlopen;
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/exceptions/LoginException.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/exceptions/LoginException.java
index 65446a9..67895b3 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/exceptions/LoginException.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/exceptions/LoginException.java
@@ -23,4 +23,8 @@ public class LoginException extends Exception {
public LoginException(String message) {
super(message);
}
+
+ public LoginException(String message, Exception cause) {
+ super(message, cause);
+ }
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/StringUtils.java bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/StringUtils.java
index f85b8f2..6656ba3 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/StringUtils.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/StringUtils.java
@@ -13,7 +13,7 @@ public class StringUtils {
try {
return string.getBytes(CHARSET);
} catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Internal error");
+ throw new RuntimeException("Internal error", e);
}
}
@@ -21,7 +21,7 @@ public class StringUtils {
try {
return new String(bytes, CHARSET);
} catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Internal error");
+ throw new RuntimeException("Internal error", e);
}
}
}
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java
index 616084c..bbae0ee 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java
@@ -86,7 +86,7 @@ public class CertPinningSSLSocketFactory extends SSLSocketFactory {
context.init(keyManagers, new TrustManager[]{mTrustManager}, null);
return context;
} catch (Exception e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
diff --git config/quality/pmd/pmd-ruleset.xml config/quality/pmd/pmd-ruleset.xml
index 288976e..05b8f94 100644
--- config/quality/pmd/pmd-ruleset.xml
+++ config/quality/pmd/pmd-ruleset.xml
@@ -104,7 +104,6 @@
-
commit 35a0c501384bd9bd99f998d48fd5e2cd1b32fa5e (tag: v1.9.13)
Author: Mathias AÌŠhsberg
Date: Thu Nov 3 20:32:14 2016 +0100
Creates release v1.9.13
diff --git CHANGELOG CHANGELOG
index f2f5b8d..91dd35a 100644
--- CHANGELOG
+++ CHANGELOG
@@ -1,5 +1,8 @@
Please view this file on the master branch, on stable branches it's out of date.
+v1.9.13 (2016-11-03)
+* Fixes Crashlytics logging issue
+
v1.9.12 (2016-11-02)
* Bioklubben: Use https. It's secure and http page no longer exists.
* Östgötatrafiken: Adapt to new login page (Facebook login not supported)
commit 709cf1fa638b955646f76775592a433b0e4ad707
Author: Johan Walles
Date: Thu Nov 3 07:30:07 2016 +0100
Log correct bank names to Crashlytics
diff --git app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
index bea4936..e5c019d 100644
--- app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
+++ app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
@@ -56,7 +56,7 @@ public class LoggingUtils {
}
logCustom(new CustomEvent("Disabled Bank").
- putCustomAttribute("Name", bank.getDisplayName()));
+ putCustomAttribute("Name", bank.getName()));
}
public static void logBankUpdate(Bank bank, boolean withTransactions) {
@@ -65,7 +65,7 @@ public class LoggingUtils {
}
logCustom(new CustomEvent("Bank Updated").
- putCustomAttribute("Name", bank.getDisplayName()).
+ putCustomAttribute("Name", bank.getName()).
putCustomAttribute("With Transactions", Boolean.toString(withTransactions)));
boolean hasTransactions = false;
@@ -76,7 +76,7 @@ public class LoggingUtils {
}
if (withTransactions && !hasTransactions) {
logCustom(new CustomEvent("Bank Without Transactions").
- putCustomAttribute("Name", bank.getDisplayName()));
+ putCustomAttribute("Name", bank.getName()));
}
}
commit c60033a4f1f18446e0c298147764af052f90e0a6 (tag: v1.9.12)
Author: Mathias AÌŠhsberg
Date: Wed Nov 2 22:25:10 2016 +0100
Create release v1.9.12
diff --git CHANGELOG CHANGELOG
index 5ebd411..f2f5b8d 100644
--- CHANGELOG
+++ CHANGELOG
@@ -1,8 +1,9 @@
Please view this file on the master branch, on stable branches it's out of date.
-Not yet released
+v1.9.12 (2016-11-02)
* Bioklubben: Use https. It's secure and http page no longer exists.
* Östgötatrafiken: Adapt to new login page (Facebook login not supported)
+* Removes broken encryption
v1.9.11 (2016-10-26)
* Warn about disabled banks in the transactions list
commit 1e50923e7b4092101945b4f73b27e82d1cff69f0
Author: Mathias AÌŠhsberg
Date: Wed Nov 2 22:21:59 2016 +0100
Update certificates
diff --git bankdroid-legacy/src/main/res/raw/cert_danskebank.pem bankdroid-legacy/src/main/res/raw/cert_danskebank.pem
index 328a9ec..8a9fe0a 100644
--- bankdroid-legacy/src/main/res/raw/cert_danskebank.pem
+++ bankdroid-legacy/src/main/res/raw/cert_danskebank.pem
@@ -1,31 +1,32 @@
-----BEGIN CERTIFICATE-----
-MIIFOTCCBCGgAwIBAgISESGZp5e2NeqwsdyPhd1B3uLdMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUwNDE0MTMxNzAzWhcNMTYxMTA4MTI1NDQzWjBjMQswCQYD
-VQQGEwJESzELMAkGA1UECBMCREsxEzARBgNVBAcTCkNvcGVuaGFnZW4xGDAWBgNV
-BAoTD0RhbnNrZSBCYW5rIEEvUzEYMBYGA1UEAxQPKi5kYW5za2ViYW5rLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtoh4WuhtiJKh/585noJRB+nx
-9DgSK4+oE4zpYX5kihpbqVf/UgUvfl73MDMcbFM4300q2CKh+O1dDRMcPNNdNTHN
-PRtnNAoBlHrRU1OtfLJGYfQ5I8zWbip1CbY8DfSnNoav4JhgV3Jwryq+WpVk6Nww
-YsfuJbyWrWJe2bIwydGIOrbyF+C1MNkUNRnB80NTNzPYL7VtecmfJtXm5MJspWNa
-ZPSIQekrxoyxGTkJiBvRSFTioH5RgwVhC5guX08c2sZL2aMZiBazytZz4H4K89qF
-ORwebPbq48QprvqHB8N1HFn2ygoab8HruWhoI6zz9sgbhOsKiqRQD6LcIcxMIwID
-AQABo4IB4jCCAd4wDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQIC
-MDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9z
-aXRvcnkvMCkGA1UdEQQiMCCCDyouZGFuc2tlYmFuay5zZYINZGFuc2tlYmFuay5z
-ZTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNV
-HR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsc2hhMmcyLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwTQYIKwYB
-BQUHMAKGQWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0L2dzb3Jn
-YW5pemF0aW9udmFsc2hhMmcycjEuY3J0MD8GCCsGAQUFBzABhjNodHRwOi8vb2Nz
-cDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxzaGEyZzIwHQYDVR0O
-BBYEFJcClG8LQNfWNbnpuFz9mOAqlhhRMB8GA1UdIwQYMBaAFJbeYfG9HBYpUxzA
-zH07gwBA5hp8MA0GCSqGSIb3DQEBCwUAA4IBAQC9Zg40R7JHvAyF7k+D/08+vqQT
-fpW0sxH8OBYGZgZ9sCLyuJuuqePWMh5dFpe1xjeDZUhF2WZx8rtBpe/bNEAcDOJM
-taxlJizeTzVGx9DUmGEyfn6U1ot+peaJbjlpXaMH9VAwf0uhjanXD3jDz7S/7Iwu
-ZHrJcgUmXVzxBzWHq3gd5zfbCrlBxvC+kZhO2j6Odl700NKSVSIYJI/E0VQI01x1
-lgAQ+1dWq9vHu83nsAxYW56elie/kplkRvPzow3ihI3cx8HVjoR2YNUS4ZuaW1vE
-Ww8D9KttG3Qg6htbBX3lSUplls2Amto2aK99bjn6aN6jCdddgyj3xwc975tZ
+MIIFSjCCBDKgAwIBAgIMI2d4vBm6pr6l/ezfMA0GCSqGSIb3DQEBCwUAMGYxCzAJ
+BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNH
+bG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g
+RzIwHhcNMTYwOTEzMTEzNjAxWhcNMTgwOTE0MTEzNjAxWjBtMQswCQYDVQQGEwJE
+SzETMBEGA1UECBMKQ29wZW5oYWdlbjEVMBMGA1UEBxMMQ29wZW5oYWdlbiBLMRgw
+FgYDVQQKEw9EYW5za2UgQmFuayBBL1MxGDAWBgNVBAMMDyouZGFuc2tlYmFuay5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANpBHTaIScLocNcQoOuj
+PSX3xwlbomedbXDaeM1LBRLWIiGNibC/XUYGNjn+4tvYyU+B9GDYXLL1C6m3YHsu
+Fts0CamxLYS2VSLCjc/v9sFbDZcodj+6sE9/AXhwmjYj8YC6p7FHcK7LGYYOoBAd
+YCuQl7Xd+yaCbajOwyyoItiEe6qf0/hmV2SH6rJsQtPSCbUqMX3kAgAlQOhCqMdD
+ke6w4TiQAHv+An4ceF7KuMIPOzHB2/PO1Z/YQLG1vLZMA892fuJeFH5KuvtN6d9a
+h1z21vyu7eHsAg/Ua1HvEGYaA4xjQM5czoP4yQSJaR0kbpp1hrCv0q3K9R6NIUhF
+lC0CAwEAAaOCAe8wggHrMA4GA1UdDwEB/wQEAwIFoDCBoAYIKwYBBQUHAQEEgZMw
+gZAwTQYIKwYBBQUHMAKGQWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2Fj
+ZXJ0L2dzb3JnYW5pemF0aW9udmFsc2hhMmcycjEuY3J0MD8GCCsGAQUFBzABhjNo
+dHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxzaGEy
+ZzIwVgYDVR0gBE8wTTBBBgkrBgEEAaAyARQwNDAyBggrBgEFBQcCARYmaHR0cHM6
+Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQICMAkGA1Ud
+EwQCMAAwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9iYWxzaWduLmNv
+bS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwKQYDVR0RBCIwIIIPKi5k
+YW5za2ViYW5rLnNlgg1kYW5za2ViYW5rLnNlMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAdBgNVHQ4EFgQU5QZdNIS6nLfk6lV4vHVRHg6DTlMwHwYDVR0j
+BBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQELBQADggEBAB5P
+l1RAQdS2tXyefgJaymhVpcJds63grMyUztkU6lzYbTbdZsMa5x96WLjfvdDDTVmI
+pP5OMlv1q7Gh/4uhkIPOE9VH2thTyHsg9jUetBPSOAJqEi5DLGtlpYqlDRPqDrZp
+bSP5PpKWOC5AXy4cho/Ix4dkRamB9zT7lbYtusCP3Cgnbfm00b2gmOe9ax8jOpXb
+/1zLd7YTjmrGrElIuA0I1FmsEsVzPp0BONaSUVjWtJP4LJ+rQqp/0+iCKdBVLLbA
+sE/FCXopdjvWaQgHoUDKes6FJmY4h0rDpViU3ClTEvfN+DdRlxlODRw0STh+CFtl
+SnEPwHpG0wzZnwfPFvU=
-----END CERTIFICATE-----
mobil.danskebank.se:443
diff --git bankdroid-legacy/src/main/res/raw/cert_meniga.pem bankdroid-legacy/src/main/res/raw/cert_meniga.pem
index 828d693..a899ce9 100644
--- bankdroid-legacy/src/main/res/raw/cert_meniga.pem
+++ bankdroid-legacy/src/main/res/raw/cert_meniga.pem
@@ -1,31 +1,32 @@
-----BEGIN CERTIFICATE-----
-MIIFLDCCBBSgAwIBAgIHS2MFZfZKXTANBgkqhkiG9w0BAQsFADCBtDELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
-BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMS0wKwYDVQQLEyRodHRwOi8vY2VydHMu
-Z29kYWRkeS5jb20vcmVwb3NpdG9yeS8xMzAxBgNVBAMTKkdvIERhZGR5IFNlY3Vy
-ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjAeFw0xNDEwMzAxNTA0MTJaFw0x
-NjEwMzAxNTA0MTJaMEwxCzAJBgNVBAYTAklTMRIwEAYDVQQHEwlSZXlramF2aWsx
-EzARBgNVBAoTCk1lbmlnYSBlaGYxFDASBgNVBAMMCyoubWVuaWdhLmlzMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwSMfGQ1DRMH6NuQm6AjlpnvHZMls
-iqtlgneL32kRd6FHNTk3HoEy5s+AnfJhx2AO5aNuOb9mht7TwNZnfdRsK7RUOcN1
-w8hQDOlHeD4VlPzNm4rrlFjfMrsLG/8IlvKD7JWCh0rirPnSYfKXjTiEbCvHKXJ4
-mEhxOKrVD4It1UhZqZ3enVkMkUhDJYlyW0sW0fWSZGZkDopK6VX5O/mQ+AQrBfXb
-UhJTubLAi0LRvQHexQPTs3hLLKWol0EUVoiqNALT19+y1+gy4Ojg8D2B/TOVP9vq
-TQl8WX0gXKY7tzQPDyQ9KfFL+yluqahyEf1PR2QkALnz0BU76Dg41AHN2wIDAQAB
-o4IBqDCCAaQwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDgYDVR0PAQH/BAQDAgWgMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9j
-cmwuZ29kYWRkeS5jb20vZ2RpZzJzMi0wLmNybDBTBgNVHSAETDBKMEgGC2CGSAGG
-/W0BBxcCMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRk
-eS5jb20vcmVwb3NpdG9yeS8wdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhho
-dHRwOi8vb2NzcC5nb2RhZGR5LmNvbS8wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZXJ0
-aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS9nZGlnMi5jcnQwHwYDVR0j
-BBgwFoAUQMK9J47MNIMwojPX+2yz8LQsgM4wIQYDVR0RBBowGIILKi5tZW5pZ2Eu
-aXOCCW1lbmlnYS5pczAdBgNVHQ4EFgQUdvrJexWWM/V5ciXjgKRnPjE8byAwDQYJ
-KoZIhvcNAQELBQADggEBAIfo9SNMcfaYqgn8Fhydfr3rJM4qY8YMP/KIQfWhn/yZ
-Gver/aRIfsZp6eCOg/qk4F+zJvORkZhw8jzYRRlzJpcSvy9o8n6sPXkU2gw3FiZj
-B7EFJ2sdd2ZsmeZWbGANSRgEupxVsITu+HcDfjGcJ5q/3MLXQvthAB/hCU8h/q03
-LzGIS3OGmbxZLZTQlMCT2nPwte6yd3xSRSBGXOFpT3KTHKe6Gggq5e865IodXFbX
-UGJNNqg9tMjg0n8iQp9Pn7I3J8vh673TmhFB05wfovKJ3GtB50U0tIwpGq38PLQ/
-83CWGJvQw2hT0OP6EwRKXIESPvxFC269xJdUwAuHrg0=
+MIIFQDCCBCigAwIBAgIIHHBEGyxYdQQwDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
+GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
+LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1
+cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwODI1MTMzNDM4WhcN
+MTkxMDMwMTUwNDEyWjBVMQswCQYDVQQGEwJJUzETMBEGA1UEBwwKS8OzcGF2b2d1
+cjEbMBkGA1UEChMSTWVuaWdhIEljZWxhbmQgZWhmMRQwEgYDVQQDDAsqLm1lbmln
+YS5pczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEjHxkNQ0TB+jbk
+JugI5aZ7x2TJbIqrZYJ3i99pEXehRzU5Nx6BMubPgJ3yYcdgDuWjbjm/Zobe08DW
+Z33UbCu0VDnDdcPIUAzpR3g+FZT8zZuK65RY3zK7Cxv/CJbyg+yVgodK4qz50mHy
+l404hGwrxylyeJhIcTiq1Q+CLdVIWamd3p1ZDJFIQyWJcltLFtH1kmRmZA6KSulV
++Tv5kPgEKwX121ISU7mywItC0b0B3sUD07N4SyylqJdBFFaIqjQC09ffstfoMuDo
+4PA9gf0zlT/b6k0JfFl9IFymO7c0Dw8kPSnxS/spbqmochH9T0dkJAC589AVO+g4
+ONQBzdsCAwEAAaOCAbIwggGuMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIFoDA1BgNVHR8ELjAsMCqgKKAm
+hiRodHRwOi8vY3JsLmdvZGFkZHkuY29tL2dkaWcyczItMy5jcmwwXQYDVR0gBFYw
+VDBIBgtghkgBhv1tAQcXAjA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNh
+dGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMAgGBmeBDAECAjB2BggrBgEFBQcB
+AQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdvZGFkZHkuY29tLzBABggr
+BgEFBQcwAoY0aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBvc2l0
+b3J5L2dkaWcyLmNydDAfBgNVHSMEGDAWgBRAwr0njsw0gzCiM9f7bLPwtCyAzjAh
+BgNVHREEGjAYggsqLm1lbmlnYS5pc4IJbWVuaWdhLmlzMB0GA1UdDgQWBBR2+sl7
+FZYz9XlyJeOApGc+MTxvIDANBgkqhkiG9w0BAQsFAAOCAQEAR+uxgkI6AfSB+Txd
+IYbWQEYYjTXDWCNGoNp5Y+Dl1M8qdBKjYXfyYAKOWCNi4qRwDk1+QOtv6AB3CkOy
+H4O6HmhKcmeGOw2zpKzMLOD4y58VJr0LpIBvE4WNVHssjhKvZizaD5xGLtDbogXn
+O5o1STzUp0FzQKwVtLw4KdE7UEJwfA7Q/MNOjIuzylNmKa2dDjHv+DfcJab4Qhw1
+1qUGdDIZxLOgyMkZiO1UbqBtctOeYgYNphBAoyzWurLmu0n7fzhhdCZTq67XHJAE
+xV/zSLYmh50rSN1GEAg69zo5fAQFn9SKTTGdDo5jqB3hAHBiuf4/F1j0DWQ96kNK
+2F8WeQ==
-----END CERTIFICATE-----
www.meniga.is:443
commit d32deec5dbe785ef35b1cb89484d6c29653e370c
Author: Johan Walles
Date: Mon Oct 31 21:42:39 2016 +0100
Enable PMD's field-can-be-local-var warning
diff --git app/src/main/java/com/liato/bankdroid/db/DBAdapter.java app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
index e9850ef..af07d75 100644
--- app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
+++ app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
@@ -35,8 +35,6 @@ import java.util.Map;
public class DBAdapter {
- private DatabaseHelper mDbHelper;
-
private SQLiteDatabase mDb;
/**
@@ -46,8 +44,8 @@ public class DBAdapter {
* @param ctx the Context within which to work
*/
public DBAdapter(Context ctx) {
- mDbHelper = DatabaseHelper.getHelper(ctx);
- mDb = mDbHelper.getWritableDatabase();
+ DatabaseHelper dbHelper = DatabaseHelper.getHelper(ctx);
+ mDb = dbHelper.getWritableDatabase();
}
/**
diff --git app/src/main/java/com/liato/bankdroid/lockpattern/ChooseLockPatternExample.java app/src/main/java/com/liato/bankdroid/lockpattern/ChooseLockPatternExample.java
index 0e7502e..f17d78b 100644
--- app/src/main/java/com/liato/bankdroid/lockpattern/ChooseLockPatternExample.java
+++ app/src/main/java/com/liato/bankdroid/lockpattern/ChooseLockPatternExample.java
@@ -36,8 +36,6 @@ public class ChooseLockPatternExample extends Activity implements View.OnClickLi
private View mSkipButton;
- private View mImageView;
-
private AnimationDrawable mAnimation;
private Runnable mRunnable = new Runnable() {
@@ -94,10 +92,10 @@ public class ChooseLockPatternExample extends Activity implements View.OnClickLi
mSkipButton = findViewById(R.id.skip_button);
mSkipButton.setOnClickListener(this);
- mImageView = (ImageView) findViewById(R.id.lock_anim);
- mImageView.setBackgroundResource(R.drawable.lock_anim);
- mImageView.setOnClickListener(this);
- mAnimation = (AnimationDrawable) mImageView.getBackground();
+ View imageView = (ImageView) findViewById(R.id.lock_anim);
+ imageView.setBackgroundResource(R.drawable.lock_anim);
+ imageView.setOnClickListener(this);
+ mAnimation = (AnimationDrawable) imageView.getBackground();
}
protected void startAnimation(final AnimationDrawable animation) {
diff --git app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java
index 86f7136..4817e11 100644
--- app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java
+++ app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java
@@ -36,8 +36,6 @@ public class ColorPickerDialog
private ColorPickerView mColorPicker;
- private ColorPickerPanelView mOldColor;
-
private ColorPickerPanelView mNewColor;
private OnColorChangedListener mListener;
@@ -72,20 +70,20 @@ public class ColorPickerDialog
setTitle(R.string.dialog_color_picker);
mColorPicker = (ColorPickerView) layout.findViewById(R.id.color_picker_view);
- mOldColor = (ColorPickerPanelView) layout.findViewById(R.id.old_color_panel);
+ ColorPickerPanelView oldColor = (ColorPickerPanelView) layout.findViewById(R.id.old_color_panel);
mNewColor = (ColorPickerPanelView) layout.findViewById(R.id.new_color_panel);
- ((LinearLayout) mOldColor.getParent()).setPadding(
+ ((LinearLayout) oldColor.getParent()).setPadding(
Math.round(mColorPicker.getDrawingOffset()),
0,
Math.round(mColorPicker.getDrawingOffset()),
0
);
- mOldColor.setOnClickListener(this);
+ oldColor.setOnClickListener(this);
mNewColor.setOnClickListener(this);
mColorPicker.setOnColorChangedListener(this);
- mOldColor.setColor(color);
+ oldColor.setColor(color);
mColorPicker.setColor(color, true);
}
diff --git bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java
index 62a1b46..3a47c5b 100644
--- bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java
+++ bankdroid-core/src/main/java/com/liato/bankdroid/configuration/DefaultConnectionConfiguration.java
@@ -8,19 +8,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
-public enum DefaultConnectionConfiguration {
-
- INSTANCE;
+public class DefaultConnectionConfiguration {
public static final String NAME = "provider.configuration.name";
- private List configuration;
-
- DefaultConnectionConfiguration() {
- configuration = createConfiguration();
- }
+ private final static List configuration = createConfiguration();
- private List createConfiguration() {
+ private static List createConfiguration() {
List configuration = new ArrayList<>();
configuration.add(new FieldBuilder(NAME, ResourceBundle.getBundle("i18n.application"))
.placeholder("")
@@ -30,6 +24,6 @@ public enum DefaultConnectionConfiguration {
}
public static List fields() {
- return INSTANCE.configuration;
+ return configuration;
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java
index 84bcb8d..1ac76d6 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/coop/Coop.java
@@ -80,8 +80,6 @@ public class Coop extends Bank {
private ObjectMapper mObjectMapper;
- private String response;
-
public Coop(Context context) {
super(context, R.drawable.logo_coop);
@@ -141,7 +139,7 @@ public class Coop extends Bank {
login();
- response = urlopen.open("https://www.coop.se/Mina-sidor/Oversikt/Mina-poang/");
+ String response = urlopen.open("https://www.coop.se/Mina-sidor/Oversikt/Mina-poang/");
Document dResponse = Jsoup.parse(response);
Account poang = new Account("\u2014 Poäng",
Helpers.parseBalance(dResponse.select(".Grid-cell--1 p").text()),
diff --git config/quality/pmd/pmd-ruleset.xml config/quality/pmd/pmd-ruleset.xml
index 19538ce..288976e 100644
--- config/quality/pmd/pmd-ruleset.xml
+++ config/quality/pmd/pmd-ruleset.xml
@@ -113,7 +113,6 @@
-
commit 37f16fda5cc03d3b2d6b9180e6bcb2ed5d600c57
Author: Johan Walles
Date: Tue Nov 1 22:06:24 2016 +0100
Fix whitespace issues
diff --git app/build.gradle app/build.gradle
index aafa141..11832d8 100644
--- app/build.gradle
+++ app/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
apply from: '../config/quality/quality.gradle'
apply plugin: "org.ajoberstar.grgit"
-if(new File('app/crashlytics.properties').exists()) {
+if (new File('app/crashlytics.properties').exists()) {
apply plugin: 'io.fabric'
}
diff --git app/src/main/java/com/liato/bankdroid/BankEditActivity.java app/src/main/java/com/liato/bankdroid/BankEditActivity.java
index fce0bbe..835c64e 100644
--- app/src/main/java/com/liato/bankdroid/BankEditActivity.java
+++ app/src/main/java/com/liato/bankdroid/BankEditActivity.java
@@ -122,7 +122,7 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
@OnClick(R.id.btnSettingsOk)
public void onSubmit(View v) {
- if(!validate()) {
+ if (!validate()) {
return;
}
SELECTED_BANK.setProperties(getFormParameters(SELECTED_BANK.getConnectionConfiguration()));
@@ -139,7 +139,7 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
@Override
public void onItemSelected(AdapterView parentView, View selectedItemView, int pos, long id) {
Bank selectedBank = (Bank) parentView.getItemAtPosition(pos);
- if(SELECTED_BANK == null || !SELECTED_BANK.equals(selectedBank)) {
+ if (SELECTED_BANK == null || !SELECTED_BANK.equals(selectedBank)) {
SELECTED_BANK = selectedBank;
mFormContainer.removeAllViewsInLayout();
createForm(SELECTED_BANK.getConnectionConfiguration(),
@@ -154,10 +154,10 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
private void createForm(List... configurations) {
- for(List fields : configurations) {
+ for (List fields : configurations) {
for (Field field : fields) {
createLabel(field);
- if(field.getValues().isEmpty()) {
+ if (field.getValues().isEmpty()) {
createField(field);
} else {
createSpinner(field);
@@ -203,7 +203,7 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
DefaultConnectionConfiguration.NAME);
customName.setText(bank.getCustomName());
- for(Map.Entry property : bank.getProperties().entrySet()) {
+ for (Map.Entry property : bank.getProperties().entrySet()) {
EditText propertyInput = (EditText) mFormContainer.findViewWithTag(property.getKey());
propertyInput.setText(property.getValue());
}
@@ -211,7 +211,7 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
private Map getFormParameters(List fields) {
Map properties = new HashMap<>();
- for(Field field : fields) {
+ for (Field field : fields) {
properties.put(field.getReference(), getFormParameter(field.getReference()));
}
return properties;
@@ -219,10 +219,10 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
private String getFormParameter(String property) {
View propertyView = mFormContainer.findViewWithTag(property);
- if(propertyView instanceof EditText) {
+ if (propertyView instanceof EditText) {
EditText propertyInput = (EditText) propertyView;
return propertyInput.getText().toString().trim();
- } else if(propertyView instanceof Spinner) {
+ } else if (propertyView instanceof Spinner) {
Spinner spinnerProperty = (Spinner) propertyView;
Entry entry = (Entry) spinnerProperty.getSelectedItem();
return entry.getKey();
@@ -235,7 +235,7 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
boolean valid = true;
Iterator fields = Iterators.concat(SELECTED_BANK.getConnectionConfiguration().iterator(),
DefaultConnectionConfiguration.fields().iterator());
- while(fields.hasNext()) {
+ while (fields.hasNext()) {
Field field = fields.next();
try {
field.validate(getFormParameter(field.getReference()));
diff --git app/src/main/java/com/liato/bankdroid/db/DBAdapter.java app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
index 215c59f..e9850ef 100644
--- app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
+++ app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
@@ -136,7 +136,7 @@ public class DBAdapter {
public Cursor fetchProperties(String bankId) {
return mDb.query(Database.PROPERTY_TABLE_NAME, null,
- Database.PROPERTY_CONNECTION_ID+"='"+bankId+"'", null, null, null, null);
+ Database.PROPERTY_CONNECTION_ID + "='" + bankId + "'", null, null, null, null);
}
public long updateBank(Bank bank) {
@@ -162,9 +162,9 @@ public class DBAdapter {
}
if (bankId != -1) {
Map properties = bank.getProperties();
- for(Map.Entry property : properties.entrySet()) {
+ for (Map.Entry property : properties.entrySet()) {
String value = property.getValue();
- if(value != null && !value.isEmpty()) {
+ if (value != null && !value.isEmpty()) {
ContentValues propertyValues = new ContentValues();
propertyValues.put(Database.PROPERTY_KEY, property.getKey());
propertyValues.put(Database.PROPERTY_VALUE, value);
diff --git app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java
index e4b166a..a295de8 100644
--- app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java
+++ app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java
@@ -74,7 +74,7 @@ final public class DatabaseHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + LegacyDatabase.BANK_TABLE_NAME + " ADD " +
LegacyDatabase.BANK_HIDE_ACCOUNTS + " integer;");
}
- if(oldVersion <= 11) {
+ if (oldVersion <= 11) {
try {
db.beginTransaction();
db.execSQL(Database.TABLE_CONNECTION_PROPERTIES);
@@ -104,7 +104,7 @@ final public class DatabaseHelper extends SQLiteOpenHelper {
+ LegacyDatabase.BANK_HIDE_ACCOUNTS + " FROM " + tempTable);
// Add username, password and extras fields to properties table.
- Cursor c = db.query(tempTable, null, null, null,null,null,null);
+ Cursor c = db.query(tempTable, null, null, null, null, null, null);
try {
if (!(c == null || c.isClosed() || (c.isBeforeFirst() && c.isAfterLast()))) {
while (!c.isLast() && !c.isAfterLast()) {
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/Entry.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/Entry.java
index 8201e43..e0d04d0 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/Entry.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/Entry.java
@@ -6,7 +6,7 @@ public class Entry {
private final String mValue;
public Entry(String key, String value) {
- if(key == null || key.trim().isEmpty()) {
+ if (key == null || key.trim().isEmpty()) {
throw new IllegalArgumentException("key cannot be null or empty.");
}
mKey = key;
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/FieldBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/FieldBuilder.java
index ad41c8f..4d1ce55 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/FieldBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/configuration/FieldBuilder.java
@@ -13,7 +13,7 @@ public class FieldBuilder {
private BasicField field;
/**
- * Create a new {@link Field} builder without i18n support.
+ * Create a new {@link Field} builder without i18n support.
*/
public FieldBuilder(String reference) {
this(reference, null);
@@ -24,7 +24,7 @@ public class FieldBuilder {
* The following keys needs to be in the ResourceBundle:
* {@code field.{reference}.label} - Locale label value
* {@code field.{reference}.placeholder} - Locale placeholder value.
- *
+ *
* Setting {@link #placeholder(String)} or {@link #label(String) specifically will override the i18n values.
* Otherwise they will be set to the value specified in the Locale bundle or in the default bundle if not present.
* If a key is not present at all in the ResourceBundle the key will will be returned.
@@ -32,7 +32,7 @@ public class FieldBuilder {
* @param bundle The ResourceBundle to be used for i18n support.
*/
public FieldBuilder(String reference, ResourceBundle bundle) {
- if(reference == null || reference.trim().isEmpty()) {
+ if (reference == null || reference.trim().isEmpty()) {
throw new IllegalArgumentException("reference must be provided.");
}
field = new BasicField(reference, bundle);
@@ -146,7 +146,7 @@ public class FieldBuilder {
@Override
public List getValues() {
- if(values == null) {
+ if (values == null) {
values = Collections.emptyList();
}
return values;
@@ -154,18 +154,18 @@ public class FieldBuilder {
@Override
public void validate(String value) throws IllegalArgumentException {
- if(isRequired()) {
- if(value == null || value.trim().isEmpty()) {
+ if (isRequired()) {
+ if (value == null || value.trim().isEmpty()) {
throw new IllegalArgumentException(String.format("%s is required", getLabel()));
}
- if(validator != null) {
+ if (validator != null) {
validator.validate(value);
}
}
}
private String getLocaleString(String key) {
- if(!isLocale()) {
+ if (!isLocale()) {
return null;
}
String propertyKey = String.format("field.%s.%s", getReference(), key);
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AbstractAccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AbstractAccountBuilder.java
index 44c8e9b..06b2566 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AbstractAccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AbstractAccountBuilder.java
@@ -34,7 +34,7 @@ abstract class AbstractAccountBuilder> {
}
public T addCustomAttribute(String key, String value) {
- if(mCustomAttributes == null) {
+ if (mCustomAttributes == null) {
mCustomAttributes = new HashMap<>();
}
mCustomAttributes.put(key, value);
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AccountBuilder.java
index 8dff297..ef3c9d2 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/AccountBuilder.java
@@ -58,7 +58,7 @@ public class AccountBuilder extends AbstractAccountBuilder {
@Override
public Map getCustomAttributes() {
- return mCustomAttributes == null ? Collections.emptyMap() : mCustomAttributes;
+ return mCustomAttributes == null ? Collections.emptyMap() : mCustomAttributes;
}
}
}
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/CreditCardAccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/CreditCardAccountBuilder.java
index f837bab..d5343cb 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/CreditCardAccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/CreditCardAccountBuilder.java
@@ -10,7 +10,7 @@ import java.util.Map;
import static com.liato.bankdroid.api.domain.account.impl.AccountBuilder.BasicAccount;
-public class CreditCardAccountBuilder extends AbstractAccountBuilder{
+public class CreditCardAccountBuilder extends AbstractAccountBuilder {
private BigDecimal mCreditLimit;
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityAccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityAccountBuilder.java
index 67abd33..f34df22 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityAccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityAccountBuilder.java
@@ -11,7 +11,7 @@ import java.util.Map;
import static com.liato.bankdroid.api.domain.account.impl.AccountBuilder.BasicAccount;
-public class EquityAccountBuilder extends AbstractAccountBuilder{
+public class EquityAccountBuilder extends AbstractAccountBuilder {
private BigDecimal mCost;
@@ -38,7 +38,7 @@ public class EquityAccountBuilder extends AbstractAccountBuilder();
}
mEquities.add(equity);
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityBuilder.java
index bd1a3e8..5743c7d 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/EquityBuilder.java
@@ -19,9 +19,9 @@ public class EquityBuilder {
* a 25 % loss, while {@code 1.5} is 50 % profit.
* @param currency The currency of the equity.
*/
- public EquityBuilder(BigDecimal balance, double revenue, String currency){
+ public EquityBuilder(BigDecimal balance, double revenue, String currency) {
mEquity = new BasicEquity(costFromBalanceAndRevenue(balance, revenue),
- revenueFromBalanceAndRevenueAsPerecntage(balance, revenue),currency);
+ revenueFromBalanceAndRevenueAsPerecntage(balance, revenue), currency);
}
public EquityBuilder name(String name) {
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/LiabilityAccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/LiabilityAccountBuilder.java
index d99e715..1f6a20e 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/LiabilityAccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/LiabilityAccountBuilder.java
@@ -30,7 +30,7 @@ public class LiabilityAccountBuilder extends AbstractAccountBuilder();
}
mPayments.add(payment);
@@ -69,4 +69,4 @@ public class LiabilityAccountBuilder extends AbstractAccountBuilderemptyList() : mPayments;
}
}
-}
\ No newline at end of file
+}
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/PrePaidCardAccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/PrePaidCardAccountBuilder.java
index 641fd7e..814ed20 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/PrePaidCardAccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/PrePaidCardAccountBuilder.java
@@ -9,7 +9,7 @@ import java.util.Map;
import static com.liato.bankdroid.api.domain.account.impl.AccountBuilder.BasicAccount;
-public class PrePaidCardAccountBuilder extends AbstractAccountBuilder{
+public class PrePaidCardAccountBuilder extends AbstractAccountBuilder {
private DateTime mValidFrom;
private DateTime mExpirationDate;
diff --git bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/TransactionAccountBuilder.java bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/TransactionAccountBuilder.java
index 00e1e2f..6bd988f 100644
--- bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/TransactionAccountBuilder.java
+++ bankdroid-interface/src/main/java/com/liato/bankdroid/api/domain/account/impl/TransactionAccountBuilder.java
@@ -24,7 +24,7 @@ public class TransactionAccountBuilder extends AbstractAccountBuilder();
}
mTransactions.add(transaction);
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java
index ceca10f..18a6a0c 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/Bank.java
@@ -369,7 +369,7 @@ public abstract class Bank implements Comparable, IBankTypes {
}
public Map getProperties() {
- if(this.properties == null) {
+ if (this.properties == null) {
this.properties = new HashMap<>();
}
return this.properties;
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java
index 496f9e4..d2aa87c 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java
@@ -14,7 +14,7 @@ public class LegacyBankHelper {
private static Map providerReferences;
public static String getReferenceFromLegacyId(int legacyId) {
- if(providerReferences == null) {
+ if (providerReferences == null) {
generateLegacyProviderReferences();
}
return providerReferences.get(legacyId);
@@ -22,7 +22,7 @@ public class LegacyBankHelper {
// TODO Used during refactoring. Remove before 2.0
public static int getLegacyIdFromReference(String reference) {
- if(legacyProviderReferences == null) {
+ if (legacyProviderReferences == null) {
generateLegacyProviderReferences();
}
return legacyProviderReferences.get(reference);
@@ -32,15 +32,14 @@ public class LegacyBankHelper {
Map references = new HashMap<>();
Map legacyIds = new HashMap<>();
Field[] fields = IBankTypes.class.getFields();
- for(int i = 0 ; i < fields.length; i++) {
- Field field = fields[i];
+ for (Field field : fields) {
try {
String reference = field.getName().toLowerCase().replaceAll("_", "-");
Integer legacyId = field.getInt(new IBankTypes() {
});
references.put(legacyId, reference);
legacyIds.put(reference, legacyId);
- } catch(IllegalAccessException e) {
+ } catch (IllegalAccessException e) {
Timber.e(e, "Provider could not be mapped");
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java
index b740b6e..c7fa006 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/OKQ8.java
@@ -106,7 +106,7 @@ public class OKQ8 extends Bank {
}
String postAction = matcher.group(1);
postData.add(new BasicNameValuePair("javax.faces.ViewState",
- postAction.substring(postAction.length()-5,postAction.length()-1)));
+ postAction.substring(postAction.length() - 5, postAction.length() - 1)));
postData.add(new BasicNameValuePair("loginForm", "loginForm"));
postData.add(new BasicNameValuePair("button", "Logga in"));
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java
index 620c740..9aef3df 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/SveaDirekt.java
@@ -124,7 +124,7 @@ public class SveaDirekt extends Bank {
response = urlopen.open(ACCOUNTS_URL);
Document doc = Jsoup.parse(response);
ArrayList accounts = parseAccounts(doc);
- for(Account account : accounts) {
+ for (Account account : accounts) {
response = urlopen.open(TRANSACTIONS_URL + "?account=" + account.getId());
account.setTransactions(parseTransactions(response));
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java
index 396af06..933ec1f 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/AmericanExpress.java
@@ -116,9 +116,9 @@ public class AmericanExpress extends Bank {
urlopen = login();
- for(Card card : loginResponse.getCards()) {
+ for (Card card : loginResponse.getCards()) {
Account account = asAccount(card);
- if(card.isTransactionsEnabled()) {
+ if (card.isTransactionsEnabled()) {
account.setTransactions(fetchTransactionsFor(card));
}
accounts.add(account);
@@ -137,7 +137,7 @@ public class AmericanExpress extends Bank {
"\"sortedIndex\":" + card.getSortedIndex() +
"}",
HTTP.UTF_8), true);
- if(response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
response.getEntity().consumeContent();
throw new BankException(
res.getText(R.string.update_transactions_error).toString());
@@ -147,10 +147,10 @@ public class AmericanExpress extends Bank {
.withType(TransactionsResponse.class)
.readValue(response.getEntity().getContent());
- if(details.getTransactionDetails() == null) {
+ if (details.getTransactionDetails() == null) {
throw new BankException(res.getText(R.string.server_error_try_again).toString());
}
- if(details.getTransactionDetails().getStatus() != 0) {
+ if (details.getTransactionDetails().getStatus() != 0) {
throw new BankException(details.getTransactionDetails().getMessage());
}
@@ -159,8 +159,8 @@ public class AmericanExpress extends Bank {
private List transactionsOf(@Nullable TransactionDetails details) {
List transactions = new ArrayList<>();
- if(details != null) {
- for(com.liato.bankdroid.banking.banks.americanexpress.model.Transaction transaction : details.getTransactions()) {
+ if (details != null) {
+ for (com.liato.bankdroid.banking.banks.americanexpress.model.Transaction transaction : details.getTransactions()) {
transactions.add(asTransaction(transaction));
}
}
@@ -196,17 +196,17 @@ public class AmericanExpress extends Bank {
}
private LoginResponse parseLoginResponse(HttpResponse response) throws IOException, BankException {
- if(response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
response.getEntity().consumeContent();
throw new BankException(res.getText(R.string.server_error_try_again).toString());
}
LoginResponse loginResponse = MAPPER.reader()
.withType(LoginResponse.class)
.readValue(response.getEntity().getContent());
- if(loginResponse == null || loginResponse.getLogonData() == null) {
+ if (loginResponse == null || loginResponse.getLogonData() == null) {
throw new BankException(res.getText(R.string.server_error_try_again).toString());
}
- if(loginResponse.getLogonData().getStatus() != 0) {
+ if (loginResponse.getLogonData().getStatus() != 0) {
throw new BankException(loginResponse.getLogonData().getMessage());
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/Card.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/Card.java
index c9abbe6..dbfe2d7 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/Card.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/Card.java
@@ -70,7 +70,7 @@ public class Card {
}
public BigDecimal getBalance() {
- if(summary != null && summary.getTotalBalance() != null) {
+ if (summary != null && summary.getTotalBalance() != null) {
return Helpers.parseBalance(summary.getTotalBalance().getValue()).negate();
}
return BigDecimal.ZERO;
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/LoginResponse.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/LoginResponse.java
index b63fdd0..4d4ad79 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/LoginResponse.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/LoginResponse.java
@@ -43,7 +43,7 @@ public class LoginResponse {
}
public List getCards() {
- if(summaryData != null && summaryData.getCardList() != null) {
+ if (summaryData != null && summaryData.getCardList() != null) {
return summaryData.getCardList();
}
return Collections.emptyList();
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/TransactionDetails.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/TransactionDetails.java
index 2efa7ea..8673cb6 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/TransactionDetails.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/americanexpress/model/TransactionDetails.java
@@ -40,7 +40,7 @@ public class TransactionDetails {
public List getTransactions() {
if (activityList != null) {
List transactions = new ArrayList<>();
- for(AccountActivity activity : activityList) {
+ for (AccountActivity activity : activityList) {
transactions.addAll(activity.getTransactionList());
}
return transactions;
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
index 6969afa..7e8fe82 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
@@ -129,7 +129,7 @@ public class Lansforsakringar extends Bank {
} finally {
try {
is.close();
- } catch(IOException e) {
+ } catch (IOException e) {
Timber.w(e, "Closing JSON stream failed");
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java
index c8b5272..1d58f40 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/rikslunchen/Rikslunchen.java
@@ -86,7 +86,7 @@ public class Rikslunchen extends Bank {
HttpResponse response = urlopen.openAsHttpResponse(
BASE_URL + "?cardid=" + getUsername(),
false);
- if(response.getStatusLine().getStatusCode() != 200) {
+ if (response.getStatusLine().getStatusCode() != 200) {
response.getEntity().consumeContent();
throw new LoginException(context.getString(R.string.invalid_card_number));
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/FieldTypeMapper.java bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/FieldTypeMapper.java
index 6436bdb..b57554a 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/FieldTypeMapper.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/FieldTypeMapper.java
@@ -8,7 +8,7 @@ import android.text.InputType;
public class FieldTypeMapper {
public static FieldType toFieldType(int androidFieldType) {
- switch(androidFieldType) {
+ switch (androidFieldType) {
case InputType.TYPE_CLASS_NUMBER:
return FieldType.NUMBER;
case InputType.TYPE_CLASS_PHONE:
@@ -20,7 +20,7 @@ public class FieldTypeMapper {
}
}
public static int fromFieldType(FieldType fieldType) {
- switch(fieldType) {
+ switch (fieldType) {
case NUMBER:
return InputType.TYPE_CLASS_NUMBER;
case PHONE:
diff --git config/quality/checkstyle/checkstyle.xml config/quality/checkstyle/checkstyle.xml
index 204efc7..0493359 100644
--- config/quality/checkstyle/checkstyle.xml
+++ config/quality/checkstyle/checkstyle.xml
@@ -33,16 +33,17 @@
-
+
- -->
+
diff --git config/quality/quality.gradle config/quality/quality.gradle
index bf2f1c6..9f4833d 100644
--- config/quality/quality.gradle
+++ config/quality/quality.gradle
@@ -63,7 +63,7 @@ task pmd(type: Pmd) {
}
}
-if(plugins.hasPlugin('android') || plugins.hasPlugin('com.android.library')) {
+if (plugins.hasPlugin('android') || plugins.hasPlugin('com.android.library')) {
check.dependsOn 'lint'
tasks.getByName("findbugs").dependsOn 'compileDebugSources'
tasks.getByName('findbugs').classes = files("$project.buildDir/intermediates/classes")
@@ -85,7 +85,7 @@ if(plugins.hasPlugin('android') || plugins.hasPlugin('com.android.library')) {
}
}
}
-if(plugins.hasPlugin('java')) {
+if (plugins.hasPlugin('java')) {
tasks.getByName('findbugs').classes = files("$project.buildDir/classes")
tasks.getByName('findbugs').dependsOn 'classes'
}
commit e8ebeb2488435fbf9f990cd6bfc2d9fa12a561ac
Author: Robert Högberg
Date: Fri Oct 28 00:11:49 2016 +0200
Östgötatrafiken: Adapt to new login page
Östgötatrafiken now supports three ways to log in/authenticate:
* An e-mail address
* A username (for legacy users (such as me))
* Facebook login
Bankdroid only supports e-mail/username login.
(I haven't tested e-mail login, but I expect it to work the same way
as for username logins)
diff --git CHANGELOG CHANGELOG
index 970ea23..5ebd411 100644
--- CHANGELOG
+++ CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
Not yet released
* Bioklubben: Use https. It's secure and http page no longer exists.
+* Östgötatrafiken: Adapt to new login page (Facebook login not supported)
v1.9.11 (2016-10-26)
* Warn about disabled banks in the transactions list
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java
index 37f3770..8524e38 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Ostgotatrafiken.java
@@ -45,9 +45,6 @@ public class Ostgotatrafiken extends Bank {
private static final String NAME_SHORT = "ogt";
- private static final String URL
- = "https://www.ostgotatrafiken.se/Priser--biljetter/Mina-sidor/Login/";
-
private static final int BANKTYPE_ID = IBankTypes.OSTGOTATRAFIKEN;
private Pattern reViewState = Pattern.compile(
@@ -75,7 +72,6 @@ public class Ostgotatrafiken extends Bank {
super.NAME = NAME;
super.NAME_SHORT = NAME_SHORT;
super.BANKTYPE_ID = BANKTYPE_ID;
- super.URL = URL;
}
public Ostgotatrafiken(String username, String password, Context context) throws BankException,
@@ -90,18 +86,20 @@ public class Ostgotatrafiken extends Bank {
R.raw.cert_ostgotatrafiken_login, R.raw.cert_ostgotatrafiken_overview));
List postData = new ArrayList();
- postData.add(new BasicNameValuePair("Username", getUsername()));
- postData.add(new BasicNameValuePair("Password", getPassword()));
- postData.add(new BasicNameValuePair("Login", "Logga in"));
+ postData.add(new BasicNameValuePair("", "{\"authSource\":10," +
+ "\"keepMeLimitedLoggedIn\":true," +
+ "\"userName\":\"" + getUsername() + "\"," +
+ "\"password\":\"" + getPassword() + "\"," +
+ "\"impersonateUserName\":\"\"}"));
- return new LoginPackage(urlopen, postData, response, URL);
+ return new LoginPackage(urlopen, postData, response, "https://www.ostgotatrafiken.se/ajax/Login/Attempt");
}
@Override
public Urllib login() throws LoginException, BankException, IOException {
LoginPackage lp = preLogin();
response = urlopen.open(lp.getLoginTarget(), lp.getPostData());
- if (!response.contains("Logga ut")) {
+ if (!response.contains("presentationUserName")) {
throw new LoginException(res.getText(R.string.invalid_username_password).toString());
}
return urlopen;
commit ff91ffbc69b9d82ce6e75063b8914c1a8bb28865
Author: Johan Walles
Date: Tue Nov 1 02:24:33 2016 +0100
Log bank usage statistics to Crashlytics
With this change in place we'll be able to see in Crashlytics:
* which banks are most frequently disabled
* which banks are most frequently used
* for which banks transactions updating doesn't work
diff --git app/src/main/java/com/liato/bankdroid/DataRetrieverTask.java app/src/main/java/com/liato/bankdroid/DataRetrieverTask.java
index b8145f3..331cfc3 100644
--- app/src/main/java/com/liato/bankdroid/DataRetrieverTask.java
+++ app/src/main/java/com/liato/bankdroid/DataRetrieverTask.java
@@ -24,6 +24,7 @@ import com.liato.bankdroid.banking.exceptions.BankChoiceException;
import com.liato.bankdroid.banking.exceptions.BankException;
import com.liato.bankdroid.banking.exceptions.LoginException;
import com.liato.bankdroid.db.DBAdapter;
+import com.liato.bankdroid.utils.LoggingUtils;
import com.liato.bankdroid.utils.NetworkUtils;
import android.app.AlertDialog;
@@ -80,6 +81,7 @@ public class DataRetrieverTask extends AsyncTask {
return this.dialog;
}
+ @Nullable
protected Bank getBankFromDb(long bankId, Context parent) {
return BankFactory.bankFromDb(bankId, parent, true);
}
@@ -122,6 +124,7 @@ public class DataRetrieverTask extends AsyncTask {
publishProgress(i, bank);
if (isListingAllBanks() && bank.isDisabled()) {
+ LoggingUtils.logDisabledBank(bank);
continue;
}
@@ -131,6 +134,8 @@ public class DataRetrieverTask extends AsyncTask {
bank.closeConnection();
saveBank(bank, parent);
i++;
+
+ LoggingUtils.logBankUpdate(bank, true);
} catch (final BankException e) {
this.errors.add(bank.getName() + " (" + bank.getUsername()
+ ")");
@@ -194,6 +199,7 @@ public class DataRetrieverTask extends AsyncTask {
.setIcon(android.R.drawable.ic_dialog_alert)
.setNeutralButton("Ok",
new DialogInterface.OnClickListener() {
+ @Override
public void onClick(
final DialogInterface dialog,
final int id) {
diff --git app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
index f289d76..7a82c5b 100644
--- app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
+++ app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
@@ -27,6 +27,7 @@ import com.liato.bankdroid.banking.exceptions.BankException;
import com.liato.bankdroid.banking.exceptions.LoginException;
import com.liato.bankdroid.db.DBAdapter;
import com.liato.bankdroid.liveview.LiveViewService;
+import com.liato.bankdroid.utils.LoggingUtils;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -289,7 +290,7 @@ public class AutoRefreshService extends Service {
@Override
protected Void doInBackground(final String... args) {
- errors = new ArrayList();
+ errors = new ArrayList<>();
Boolean refreshWidgets = false;
final List banks = getBanks();
if (banks.isEmpty()) {
@@ -300,7 +301,7 @@ public class AutoRefreshService extends Service {
BigDecimal diff;
BigDecimal minDelta = new BigDecimal(prefs.getString("notify_min_delta", "0"));
- final HashMap accounts = new HashMap();
+ final HashMap accounts = new HashMap<>();
for (final Bank bank : banks) {
if (prefs.getBoolean("debug_mode", false)
@@ -311,6 +312,7 @@ public class AutoRefreshService extends Service {
continue;
}
if (bank.isDisabled()) {
+ LoggingUtils.logDisabledBank(bank);
continue;
}
try {
@@ -320,6 +322,7 @@ public class AutoRefreshService extends Service {
accounts.put(account.getId(), account);
}
bank.update();
+
diff = currentBalance.subtract(bank.getBalance());
if (diff.compareTo(BigDecimal.ZERO) != 0) {
@@ -373,6 +376,9 @@ public class AutoRefreshService extends Service {
if (prefs.getBoolean(
"autoupdates_transactions_enabled", true)) {
bank.updateAllTransactions();
+ LoggingUtils.logBankUpdate(bank, true);
+ } else {
+ LoggingUtils.logBankUpdate(bank, false);
}
}
bank.closeConnection();
diff --git app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
index f0cf5dc..bea4936 100644
--- app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
+++ app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
@@ -4,6 +4,8 @@ import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.answers.Answers;
import com.crashlytics.android.answers.CustomEvent;
import com.liato.bankdroid.BuildConfig;
+import com.liato.bankdroid.banking.Account;
+import com.liato.bankdroid.banking.Bank;
import android.content.Context;
import android.text.TextUtils;
@@ -40,9 +42,41 @@ public class LoggingUtils {
}
public static void logCustom(CustomEvent event) {
- if (isCrashlyticsEnabled()) {
- event.putCustomAttribute("App Version", BuildConfig.VERSION_NAME);
- Answers.getInstance().logCustom(event);
+ if (!isCrashlyticsEnabled()) {
+ return;
+ }
+
+ event.putCustomAttribute("App Version", BuildConfig.VERSION_NAME);
+ Answers.getInstance().logCustom(event);
+ }
+
+ public static void logDisabledBank(Bank bank) {
+ if (!isCrashlyticsEnabled()) {
+ return;
+ }
+
+ logCustom(new CustomEvent("Disabled Bank").
+ putCustomAttribute("Name", bank.getDisplayName()));
+ }
+
+ public static void logBankUpdate(Bank bank, boolean withTransactions) {
+ if (!isCrashlyticsEnabled()) {
+ return;
+ }
+
+ logCustom(new CustomEvent("Bank Updated").
+ putCustomAttribute("Name", bank.getDisplayName()).
+ putCustomAttribute("With Transactions", Boolean.toString(withTransactions)));
+
+ boolean hasTransactions = false;
+ for (Account account : bank.getAccounts()) {
+ if (account.getTransactions() != null && !account.getTransactions().isEmpty()) {
+ hasTransactions = true;
+ }
+ }
+ if (withTransactions && !hasTransactions) {
+ logCustom(new CustomEvent("Bank Without Transactions").
+ putCustomAttribute("Name", bank.getDisplayName()));
}
}
commit cb2027c3121ca4c37ef8ef1c45656d27e52e37c3
Author: Johan Walles
Date: Sun Oct 30 17:12:07 2016 +0100
Require closing result cursors
diff --git app/src/main/java/com/liato/bankdroid/banking/BankFactory.java app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
index d61e0ce..db905c8 100644
--- app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
+++ app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
@@ -84,10 +84,10 @@ public class BankFactory {
ArrayList banks = new ArrayList<>();
DBAdapter db = new DBAdapter(context);
Cursor c = db.fetchBanks();
- if (c == null) {
- return banks;
- }
try {
+ if (c == null || c.getCount() == 0) {
+ return banks;
+ }
while (!c.isLast() && !c.isAfterLast()) {
c.moveToNext();
try {
@@ -109,7 +109,9 @@ public class BankFactory {
}
}
} finally {
- c.close();
+ if (c != null) {
+ c.close();
+ }
}
return banks;
}
@@ -118,38 +120,50 @@ public class BankFactory {
public static Account accountFromDb(Context context, String accountId,
boolean loadTransactions) {
DBAdapter db = new DBAdapter(context);
- Cursor c = db.getAccount(accountId);
+ Cursor ac = db.getAccount(accountId);
+
+ Account account;
+ try {
+ if (ac == null || ac.isClosed() || (ac.isBeforeFirst() && ac.isAfterLast())) {
+ return null;
+ }
- if (c == null || c.isClosed() || (c.isBeforeFirst() && c.isAfterLast())) {
- return null;
+ account = new Account(ac.getString(ac.getColumnIndex("name")),
+ new BigDecimal(ac.getString(ac.getColumnIndex("balance"))),
+ ac.getString(ac.getColumnIndex("id")).split("_", 2)[1],
+ ac.getLong(ac.getColumnIndex("bankid")),
+ ac.getInt(ac.getColumnIndex("acctype")));
+ account.setHidden(ac.getInt(ac.getColumnIndex("hidden")) == 1);
+ account.setNotify(ac.getInt(ac.getColumnIndex("notify")) == 1);
+ account.setCurrency(ac.getString(ac.getColumnIndex("currency")));
+ account.setAliasfor(ac.getString(ac.getColumnIndex("aliasfor")));
+ } finally {
+ if (ac != null) {
+ ac.close();
+ }
}
- Account account = new Account(c.getString(c.getColumnIndex("name")),
- new BigDecimal(c.getString(c.getColumnIndex("balance"))),
- c.getString(c.getColumnIndex("id")).split("_", 2)[1],
- c.getLong(c.getColumnIndex("bankid")),
- c.getInt(c.getColumnIndex("acctype")));
- account.setHidden(c.getInt(c.getColumnIndex("hidden")) == 1);
- account.setNotify(c.getInt(c.getColumnIndex("notify")) == 1);
- account.setCurrency(c.getString(c.getColumnIndex("currency")));
- account.setAliasfor(c.getString(c.getColumnIndex("aliasfor")));
- c.close();
if (loadTransactions) {
ArrayList transactions = new ArrayList<>();
String fromAccount = accountId;
if (account.getAliasfor() != null && account.getAliasfor().length() > 0) {
fromAccount = Long.toString(account.getBankDbId()) + "_" + account.getAliasfor();
}
- c = db.fetchTransactions(fromAccount);
- if (!(c == null || c.isClosed() || (c.isBeforeFirst() && c.isAfterLast()))) {
- while (!c.isLast() && !c.isAfterLast()) {
- c.moveToNext();
- transactions.add(new Transaction(c.getString(c.getColumnIndex("transdate")),
- c.getString(c.getColumnIndex("btransaction")),
- new BigDecimal(c.getString(c.getColumnIndex("amount"))),
- c.getString(c.getColumnIndex("currency"))));
+ Cursor tc = db.fetchTransactions(fromAccount);
+ try {
+ if (!(tc == null || tc.isClosed() || (tc.isBeforeFirst() && tc.isAfterLast()))) {
+ while (!tc.isLast() && !tc.isAfterLast()) {
+ tc.moveToNext();
+ transactions.add(new Transaction(tc.getString(tc.getColumnIndex("transdate")),
+ tc.getString(tc.getColumnIndex("btransaction")),
+ new BigDecimal(tc.getString(tc.getColumnIndex("amount"))),
+ tc.getString(tc.getColumnIndex("currency"))));
+ }
+ }
+ } finally {
+ if (tc != null) {
+ tc.close();
}
- c.close();
}
account.setTransactions(transactions);
}
@@ -160,10 +174,10 @@ public class BankFactory {
ArrayList accounts = new ArrayList<>();
DBAdapter db = new DBAdapter(context);
Cursor c = db.fetchAccounts(bankId);
- if (c == null) {
- return accounts;
- }
try {
+ if (c == null || c.getCount() == 0) {
+ return accounts;
+ }
while (!c.isLast() && !c.isAfterLast()) {
c.moveToNext();
try {
@@ -183,7 +197,9 @@ public class BankFactory {
}
}
} finally {
- c.close();
+ if (c != null) {
+ c.close();
+ }
}
return accounts;
}
@@ -193,10 +209,10 @@ public class BankFactory {
Map decryptedProperties = new HashMap<>();
DBAdapter db = new DBAdapter(context);
Cursor c = db.fetchProperties(Long.toString(bankId));
- if(c == null) {
- return properties;
- }
try {
+ if (c == null || c.getCount() == 0) {
+ return properties;
+ }
while (!c.isLast() && !c.isAfterLast()) {
c.moveToNext();
String key = c.getString(c.getColumnIndex(Database.PROPERTY_KEY));
@@ -214,7 +230,9 @@ public class BankFactory {
properties.put(key, value);
}
} finally {
- c.close();
+ if (c != null) {
+ c.close();
+ }
}
storeDecryptedProperties(context, bankId, decryptedProperties);
diff --git app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java
index ea72715..e4b166a 100644
--- app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java
+++ app/src/main/java/com/liato/bankdroid/db/DatabaseHelper.java
@@ -105,33 +105,38 @@ final public class DatabaseHelper extends SQLiteOpenHelper {
// Add username, password and extras fields to properties table.
Cursor c = db.query(tempTable, null, null, null,null,null,null);
- if (!(c == null || c.isClosed() || (c.isBeforeFirst() && c.isAfterLast()))) {
- while (!c.isLast() && !c.isAfterLast()) {
- c.moveToNext();
- long id = c.getLong(c.getColumnIndex(LegacyDatabase.BANK_ID));
-
- ContentValues usernameProperty = new ContentValues();
- usernameProperty.put(PROPERTY_CONNECTION_ID, id);
- usernameProperty.put(PROPERTY_KEY, LegacyProviderConfiguration.USERNAME);
- usernameProperty.put(PROPERTY_VALUE, c.getString(c.getColumnIndex(LegacyDatabase.BANK_USERNAME)));
- db.insert(PROPERTY_TABLE_NAME, null, usernameProperty);
-
- ContentValues passwordProperty = new ContentValues();
- passwordProperty.put(PROPERTY_CONNECTION_ID, id);
- passwordProperty.put(PROPERTY_KEY, LegacyProviderConfiguration.PASSWORD);
- passwordProperty.put(PROPERTY_VALUE, c.getString(c.getColumnIndex(LegacyDatabase.BANK_PASSWORD)));
- db.insert(PROPERTY_TABLE_NAME, null, passwordProperty);
-
- String extras = c.getString(c.getColumnIndex(LegacyDatabase.BANK_EXTRAS));
- if(extras != null && !extras.isEmpty()) {
- ContentValues extrasProperty = new ContentValues();
- extrasProperty.put(PROPERTY_CONNECTION_ID, id);
- extrasProperty.put(PROPERTY_KEY, LegacyProviderConfiguration.EXTRAS);
- extrasProperty.put(PROPERTY_VALUE, extras);
- db.insert(PROPERTY_TABLE_NAME, null, extrasProperty);
+ try {
+ if (!(c == null || c.isClosed() || (c.isBeforeFirst() && c.isAfterLast()))) {
+ while (!c.isLast() && !c.isAfterLast()) {
+ c.moveToNext();
+ long id = c.getLong(c.getColumnIndex(LegacyDatabase.BANK_ID));
+
+ ContentValues usernameProperty = new ContentValues();
+ usernameProperty.put(PROPERTY_CONNECTION_ID, id);
+ usernameProperty.put(PROPERTY_KEY, LegacyProviderConfiguration.USERNAME);
+ usernameProperty.put(PROPERTY_VALUE, c.getString(c.getColumnIndex(LegacyDatabase.BANK_USERNAME)));
+ db.insert(PROPERTY_TABLE_NAME, null, usernameProperty);
+
+ ContentValues passwordProperty = new ContentValues();
+ passwordProperty.put(PROPERTY_CONNECTION_ID, id);
+ passwordProperty.put(PROPERTY_KEY, LegacyProviderConfiguration.PASSWORD);
+ passwordProperty.put(PROPERTY_VALUE, c.getString(c.getColumnIndex(LegacyDatabase.BANK_PASSWORD)));
+ db.insert(PROPERTY_TABLE_NAME, null, passwordProperty);
+
+ String extras = c.getString(c.getColumnIndex(LegacyDatabase.BANK_EXTRAS));
+ if (extras != null && !extras.isEmpty()) {
+ ContentValues extrasProperty = new ContentValues();
+ extrasProperty.put(PROPERTY_CONNECTION_ID, id);
+ extrasProperty.put(PROPERTY_KEY, LegacyProviderConfiguration.EXTRAS);
+ extrasProperty.put(PROPERTY_VALUE, extras);
+ db.insert(PROPERTY_TABLE_NAME, null, extrasProperty);
+ }
}
}
- c.close();
+ } finally {
+ if (c != null) {
+ c.close();
+ }
}
db.execSQL("DROP TABLE " + tempTable);
}
diff --git config/quality/pmd/pmd-ruleset.xml config/quality/pmd/pmd-ruleset.xml
index 3109e6b..19538ce 100644
--- config/quality/pmd/pmd-ruleset.xml
+++ config/quality/pmd/pmd-ruleset.xml
@@ -25,6 +25,13 @@
+
+
+
+
+
+
+
diff --git tools/update-suppressions.sh tools/update-suppressions.sh
index 4148ea6..53ff534 100755
--- tools/update-suppressions.sh
+++ tools/update-suppressions.sh
@@ -64,6 +64,13 @@ function set_pmd_suppressions() {
+
+
+
+
+
+
+
commit 63188088e36f3e351830d0e5b1f8b0b576fa5b54
Author: Johan Walles
Date: Thu Oct 27 22:02:02 2016 +0200
Ensure on-disk passwords are unencrypted
This is a step towards removing password encryption alltogether.
The background is that it's broken on Androin Nougat anyway, and that it
didn't provide any extra security before that either.
Since Bankdroid needs to send plain text passwords to the banks, it must
be possible to retrieve the plain text passwords automatically. And if
the passwords are encrypted on disk, Bankdroid needs to have the key.
And if Bankdroid stores both the key and the encrypted password on the
phone, a determined attacker could get both anyway, and the encryption
is useless.
The only thing the encryption has protected against is a user rooting
their own device and retrieving their own plain text passwords. This
would enable the attacker to read their own account balance from the
bank.
Which they likely already could even before this change...
This change also disables an Android Lint check whose outcome changes
over time; these checks are impossible to maintain. And we fixed some
warnings.
diff --git app/src/main/java/com/liato/bankdroid/banking/BankFactory.java app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
index 9a7ea9c..d61e0ce 100644
--- app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
+++ app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
@@ -16,15 +16,20 @@
package com.liato.bankdroid.banking;
+import com.crashlytics.android.answers.CustomEvent;
import com.liato.bankdroid.banking.exceptions.BankException;
import com.liato.bankdroid.db.Crypto;
import com.liato.bankdroid.db.DBAdapter;
import com.liato.bankdroid.db.Database;
+import com.liato.bankdroid.db.DatabaseHelper;
+import com.liato.bankdroid.utils.LoggingUtils;
import net.sf.andhsli.hotspotlogin.SimpleCrypto;
+import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.Nullable;
import java.math.BigDecimal;
@@ -37,7 +42,7 @@ import timber.log.Timber;
public class BankFactory {
- public static Bank fromBanktypeId(int id, Context context) throws BankException {
+ private static Bank fromBanktypeId(int id, Context context) throws BankException {
return LegacyBankFactory.fromBanktypeId(id, context);
}
@@ -58,7 +63,7 @@ public class BankFactory {
bank.setProperties(loadProperties(id, context));
bank.setData(new BigDecimal(c.getString(c.getColumnIndex("balance"))),
- (c.getInt(c.getColumnIndex("disabled")) == 0 ? false : true),
+ (c.getInt(c.getColumnIndex("disabled")) != 0),
c.getLong(c.getColumnIndex("_id")),
c.getString(c.getColumnIndex("currency")),
c.getString(c.getColumnIndex("custname")),
@@ -76,36 +81,40 @@ public class BankFactory {
}
public static ArrayList banksFromDb(Context context, boolean loadAccounts) {
- ArrayList banks = new ArrayList();
+ ArrayList banks = new ArrayList<>();
DBAdapter db = new DBAdapter(context);
Cursor c = db.fetchBanks();
- if (c == null || c.getCount() == 0) {
+ if (c == null) {
return banks;
}
- while (!c.isLast() && !c.isAfterLast()) {
- c.moveToNext();
- try {
- Bank bank = fromBanktypeId(c.getInt(c.getColumnIndex("banktype")), context);
- long id = c.getLong(c.getColumnIndex("_id"));
- bank.setProperties(loadProperties(id, context));
- bank.setData(new BigDecimal(c.getString(c.getColumnIndex("balance"))),
- (c.getInt(c.getColumnIndex("disabled")) == 0 ? false : true),
- id,
- c.getString(c.getColumnIndex("currency")),
- c.getString(c.getColumnIndex("custname")),
- c.getInt(c.getColumnIndex("hideAccounts")));
- if (loadAccounts) {
- bank.setAccounts(accountsFromDb(context, bank.getDbId()));
+ try {
+ while (!c.isLast() && !c.isAfterLast()) {
+ c.moveToNext();
+ try {
+ Bank bank = fromBanktypeId(c.getInt(c.getColumnIndex("banktype")), context);
+ long id = c.getLong(c.getColumnIndex("_id"));
+ bank.setProperties(loadProperties(id, context));
+ bank.setData(new BigDecimal(c.getString(c.getColumnIndex("balance"))),
+ (c.getInt(c.getColumnIndex("disabled")) != 0),
+ id,
+ c.getString(c.getColumnIndex("currency")),
+ c.getString(c.getColumnIndex("custname")),
+ c.getInt(c.getColumnIndex("hideAccounts")));
+ if (loadAccounts) {
+ bank.setAccounts(accountsFromDb(context, bank.getDbId()));
+ }
+ banks.add(bank);
+ } catch (BankException e) {
+ Timber.w(e, "BankFactory.banksFromDb()");
}
- banks.add(bank);
- } catch (BankException e) {
- Timber.w(e, "BankFactory.banksFromDb()");
}
+ } finally {
+ c.close();
}
- c.close();
return banks;
}
+ @Nullable
public static Account accountFromDb(Context context, String accountId,
boolean loadTransactions) {
DBAdapter db = new DBAdapter(context);
@@ -120,13 +129,13 @@ public class BankFactory {
c.getString(c.getColumnIndex("id")).split("_", 2)[1],
c.getLong(c.getColumnIndex("bankid")),
c.getInt(c.getColumnIndex("acctype")));
- account.setHidden(c.getInt(c.getColumnIndex("hidden")) == 1 ? true : false);
- account.setNotify(c.getInt(c.getColumnIndex("notify")) == 1 ? true : false);
+ account.setHidden(c.getInt(c.getColumnIndex("hidden")) == 1);
+ account.setNotify(c.getInt(c.getColumnIndex("notify")) == 1);
account.setCurrency(c.getString(c.getColumnIndex("currency")));
account.setAliasfor(c.getString(c.getColumnIndex("aliasfor")));
c.close();
if (loadTransactions) {
- ArrayList transactions = new ArrayList();
+ ArrayList transactions = new ArrayList<>();
String fromAccount = accountId;
if (account.getAliasfor() != null && account.getAliasfor().length() > 0) {
fromAccount = Long.toString(account.getBankDbId()) + "_" + account.getAliasfor();
@@ -147,56 +156,114 @@ public class BankFactory {
return account;
}
- public static ArrayList accountsFromDb(Context context, long bankId) {
- ArrayList accounts = new ArrayList();
+ private static ArrayList accountsFromDb(Context context, long bankId) {
+ ArrayList accounts = new ArrayList<>();
DBAdapter db = new DBAdapter(context);
Cursor c = db.fetchAccounts(bankId);
- if (c == null || c.getCount() == 0) {
+ if (c == null) {
return accounts;
}
- while (!c.isLast() && !c.isAfterLast()) {
- c.moveToNext();
- try {
- Account account = new Account(c.getString(c.getColumnIndex("name")),
- new BigDecimal(c.getString(c.getColumnIndex("balance"))),
- c.getString(c.getColumnIndex("id")).split("_", 2)[1],
- c.getLong(c.getColumnIndex("bankid")),
- c.getInt(c.getColumnIndex("acctype")));
- account.setHidden(c.getInt(c.getColumnIndex("hidden")) == 1 ? true : false);
- account.setNotify(c.getInt(c.getColumnIndex("notify")) == 1 ? true : false);
- account.setCurrency(c.getString(c.getColumnIndex("currency")));
- account.setAliasfor(c.getString(c.getColumnIndex("aliasfor")));
- accounts.add(account);
- } catch (ArrayIndexOutOfBoundsException e) {
- // Probably an old Avanza account
- Timber.w(e, "Attempted to load an account without an ID: %d", bankId);
+ try {
+ while (!c.isLast() && !c.isAfterLast()) {
+ c.moveToNext();
+ try {
+ Account account = new Account(c.getString(c.getColumnIndex("name")),
+ new BigDecimal(c.getString(c.getColumnIndex("balance"))),
+ c.getString(c.getColumnIndex("id")).split("_", 2)[1],
+ c.getLong(c.getColumnIndex("bankid")),
+ c.getInt(c.getColumnIndex("acctype")));
+ account.setHidden(c.getInt(c.getColumnIndex("hidden")) == 1);
+ account.setNotify(c.getInt(c.getColumnIndex("notify")) == 1);
+ account.setCurrency(c.getString(c.getColumnIndex("currency")));
+ account.setAliasfor(c.getString(c.getColumnIndex("aliasfor")));
+ accounts.add(account);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ // Probably an old Avanza account
+ Timber.w(e, "Attempted to load an account without an ID: %d", bankId);
+ }
}
+ } finally {
+ c.close();
}
- c.close();
return accounts;
}
- private static Map loadProperties(long id, Context context) {
+ private static Map loadProperties(long bankId, Context context) {
Map properties = new HashMap<>();
+ Map decryptedProperties = new HashMap<>();
DBAdapter db = new DBAdapter(context);
- Cursor c = db.fetchProperties(Long.toString(id));
- if(c == null || c.getCount() == 0) {
+ Cursor c = db.fetchProperties(Long.toString(bankId));
+ if(c == null) {
return properties;
}
- while(!c.isLast() && !c.isAfterLast()) {
- c.moveToNext();
- String key = c.getString(c.getColumnIndex(Database.PROPERTY_KEY));
- String value = c.getString(c.getColumnIndex(Database.PROPERTY_VALUE));
- if(LegacyProviderConfiguration.PASSWORD.equals(key)) {
- try {
- value = SimpleCrypto.decrypt(Crypto.getKey(), value);
- } catch (Exception e) {
- Timber.w(e, "Failed decrypting bank properties");
+ try {
+ while (!c.isLast() && !c.isAfterLast()) {
+ c.moveToNext();
+ String key = c.getString(c.getColumnIndex(Database.PROPERTY_KEY));
+ String value = c.getString(c.getColumnIndex(Database.PROPERTY_VALUE));
+ if (LegacyProviderConfiguration.PASSWORD.equals(key)) {
+ try {
+ value = SimpleCrypto.decrypt(Crypto.getKey(), value);
+ decryptedProperties.put(key, value);
+ } catch (Exception e) {
+ Timber.i("%s %s",
+ "Failed decrypting bank properties.",
+ "This usually means they are unencrypted, which is exactly what we want them to be.");
+ }
}
+ properties.put(key, value);
}
- properties.put(key, value);
+ } finally {
+ c.close();
}
- c.close();
+
+ storeDecryptedProperties(context, bankId, decryptedProperties);
+
return properties;
}
+
+ /**
+ * Stores decrypted passwords on disk.
+ *
+ * This is a step in removing password encryption alltogether.
+ *
+ * The background is that it's broken on Androin Nougat anyway, and that it
+ * didn't provide any extra security before that either.
+ *
+ * Since Bankdroid needs to send plain text passwords to the banks, it must
+ * be possible to retrieve the plain text passwords automatically. And if the
+ * passwords are encrypted on disk, Bankdroid needs to have the key. And if
+ * Bankdroid stores both the key and the encrypted password on the phone, a
+ * determined attacker could get both anyway, and the encryption is useless.
+ *
+ * The only thing the encryption has protected against is a using rooting
+ * their own device and retrieving their own plain text passwords. This would
+ * enable the attacker to reaa their own account balance from the bank. Which
+ * they likely already could even before this change...
+ */
+ private static void storeDecryptedProperties(
+ Context context, long bankId, Map decryptedProperties)
+ {
+ if (decryptedProperties.isEmpty()) {
+ return;
+ }
+
+ Timber.i("Storing %d decrypted properties...", decryptedProperties.size());
+ SQLiteDatabase db = DatabaseHelper.getHelper(context).getWritableDatabase();
+ for (Map.Entry property : decryptedProperties.entrySet()) {
+ String value = property.getValue();
+ if (value != null && !value.isEmpty()) {
+ ContentValues propertyValues = new ContentValues();
+ propertyValues.put(Database.PROPERTY_KEY, property.getKey());
+ propertyValues.put(Database.PROPERTY_VALUE, value);
+ propertyValues.put(Database.PROPERTY_CONNECTION_ID, bankId);
+ db.insertWithOnConflict(
+ Database.PROPERTY_TABLE_NAME, null, propertyValues,
+ SQLiteDatabase.CONFLICT_REPLACE);
+ }
+ }
+ Timber.i("%d decrypted properties stored", decryptedProperties.size());
+
+ LoggingUtils.logCustom(new CustomEvent("Passwords Decrypted"));
+ }
}
diff --git app/src/main/java/com/liato/bankdroid/db/DBAdapter.java app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
index 240669b..215c59f 100644
--- app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
+++ app/src/main/java/com/liato/bankdroid/db/DBAdapter.java
@@ -18,15 +18,13 @@ package com.liato.bankdroid.db;
import com.liato.bankdroid.banking.Account;
import com.liato.bankdroid.banking.Bank;
-import com.liato.bankdroid.banking.LegacyProviderConfiguration;
import com.liato.bankdroid.banking.Transaction;
-import net.sf.andhsli.hotspotlogin.SimpleCrypto;
-
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
+import android.support.annotation.Nullable;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -34,8 +32,6 @@ import java.util.Calendar;
import java.util.List;
import java.util.Map;
-import timber.log.Timber;
-
public class DBAdapter {
@@ -169,13 +165,6 @@ public class DBAdapter {
for(Map.Entry property : properties.entrySet()) {
String value = property.getValue();
if(value != null && !value.isEmpty()) {
- if (LegacyProviderConfiguration.PASSWORD.equals(property.getKey())) {
- try {
- value = SimpleCrypto.encrypt(Crypto.getKey(), bank.getPassword());
- } catch (Exception e) {
- Timber.e(e, "Could not encrypt password.");
- }
- }
ContentValues propertyValues = new ContentValues();
propertyValues.put(Database.PROPERTY_KEY, property.getKey());
propertyValues.put(Database.PROPERTY_VALUE, value);
@@ -227,6 +216,7 @@ public class DBAdapter {
mDb.update("banks", initialValues, "_id=" + bankId, null);
}
+ @Nullable
public Cursor getBank(String bankId) {
Cursor c = mDb.query("banks",
new String[]{"_id", "balance", "banktype", "disabled",
@@ -238,10 +228,12 @@ public class DBAdapter {
return c;
}
+ @Nullable
public Cursor getBank(long bankId) {
return getBank(Long.toString(bankId));
}
+ @Nullable
public Cursor getAccount(String id) {
Cursor c = mDb.query("accounts",
new String[]{"id", "balance", "name", "bankid", "acctype", "hidden", "notify",
diff --git app/src/main/java/com/liato/bankdroid/db/Database.java app/src/main/java/com/liato/bankdroid/db/Database.java
index 0558483..93d3c14 100644
--- app/src/main/java/com/liato/bankdroid/db/Database.java
+++ app/src/main/java/com/liato/bankdroid/db/Database.java
@@ -6,7 +6,7 @@ public class Database {
static final int DATABASE_VERSION = 12;
- static final String PROPERTY_TABLE_NAME = "connection_properties";
+ public static final String PROPERTY_TABLE_NAME = "connection_properties";
public static final String PROPERTY_CONNECTION_ID = "connection_id";
public static final String PROPERTY_KEY = "property";
public static final String PROPERTY_VALUE = "value";
diff --git app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
index 4867459..f0cf5dc 100644
--- app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
+++ app/src/main/java/com/liato/bankdroid/utils/LoggingUtils.java
@@ -1,12 +1,14 @@
package com.liato.bankdroid.utils;
+import com.crashlytics.android.Crashlytics;
+import com.crashlytics.android.answers.Answers;
+import com.crashlytics.android.answers.CustomEvent;
+import com.liato.bankdroid.BuildConfig;
+
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
-import com.crashlytics.android.Crashlytics;
-import com.liato.bankdroid.BuildConfig;
-
import io.fabric.sdk.android.Fabric;
import timber.log.Timber;
@@ -37,6 +39,13 @@ public class LoggingUtils {
!EmulatorUtils.RUNNING_ON_EMULATOR;
}
+ public static void logCustom(CustomEvent event) {
+ if (isCrashlyticsEnabled()) {
+ event.putCustomAttribute("App Version", BuildConfig.VERSION_NAME);
+ Answers.getInstance().logCustom(event);
+ }
+ }
+
private static class CrashlyticsTree extends Timber.Tree {
CrashlyticsTree(Context context) {
Fabric.with(context, new Crashlytics());
diff --git app/src/main/java/net/sf/andhsli/hotspotlogin/SimpleCrypto.java app/src/main/java/net/sf/andhsli/hotspotlogin/SimpleCrypto.java
index d4a1995..88e4154 100644
--- app/src/main/java/net/sf/andhsli/hotspotlogin/SimpleCrypto.java
+++ app/src/main/java/net/sf/andhsli/hotspotlogin/SimpleCrypto.java
@@ -22,18 +22,14 @@ import javax.crypto.spec.SecretKeySpec;
* String cleartext = SimpleCrypto.decrypt(masterpassword, crypto)
*
*
+ * @deprecated Broken
+ * on Android Nougat,
+ * considered
+ * broken by Android Lint even before then.
+ *
* @author ferenc.hechler
*/
public class SimpleCrypto {
-
- private final static String HEX = "0123456789ABCDEF";
-
- public static String encrypt(String seed, String cleartext) throws Exception {
- byte[] rawKey = getRawKey(StringUtils.getBytes(seed));
- byte[] result = encrypt(rawKey, StringUtils.getBytes(cleartext));
- return toHex(result);
- }
-
public static String decrypt(String seed, String encrypted) throws Exception {
byte[] rawKey = getRawKey(StringUtils.getBytes(seed));
byte[] enc = toByte(encrypted);
@@ -56,14 +52,6 @@ public class SimpleCrypto {
return raw;
}
- private static byte[] encrypt(byte[] raw, byte[] clear) throws Exception {
- SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
- Cipher cipher = Cipher.getInstance("AES");
- cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
- byte[] encrypted = cipher.doFinal(clear);
- return encrypted;
- }
-
private static byte[] decrypt(byte[] raw, byte[] encrypted) throws Exception {
SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
Cipher cipher = Cipher.getInstance("AES");
@@ -72,7 +60,7 @@ public class SimpleCrypto {
return decrypted;
}
- public static byte[] toByte(String hexString) {
+ private static byte[] toByte(String hexString) {
int len = hexString.length() / 2;
byte[] result = new byte[len];
for (int i = 0; i < len; i++) {
@@ -80,19 +68,4 @@ public class SimpleCrypto {
}
return result;
}
-
- public static String toHex(byte[] buf) {
- if (buf == null) {
- return "";
- }
- StringBuffer result = new StringBuffer(2 * buf.length);
- for (int i = 0; i < buf.length; i++) {
- appendHex(result, buf[i]);
- }
- return result.toString();
- }
-
- private static void appendHex(StringBuffer sb, byte b) {
- sb.append(HEX.charAt((b >> 4) & 0x0f)).append(HEX.charAt(b & 0x0f));
- }
}
diff --git config/quality/lint/lint.xml config/quality/lint/lint.xml
index 8195ce2..f81c4ca 100644
--- config/quality/lint/lint.xml
+++ config/quality/lint/lint.xml
@@ -30,6 +30,7 @@
+
commit eabc99cfadbf724f5d3129bc7b011587c6fd43d0
Author: Robert Högberg
Date: Sat Oct 29 20:59:00 2016 +0200
Bioklubben: Update start web page
http://bioklubben.sf.se -> https://bioklubben.sf.se
The http version no longer exists
diff --git CHANGELOG CHANGELOG
index fa02959..970ea23 100644
--- CHANGELOG
+++ CHANGELOG
@@ -1,5 +1,8 @@
Please view this file on the master branch, on stable branches it's out of date.
+Not yet released
+* Bioklubben: Use https. It's secure and http page no longer exists.
+
v1.9.11 (2016-10-26)
* Warn about disabled banks in the transactions list
* Show warning text about disabled banks in the main activity
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java
index e31540f..df9e368 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Bioklubben.java
@@ -39,6 +39,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import eu.nullbyte.android.urllib.CertificateReader;
import eu.nullbyte.android.urllib.Urllib;
public class Bioklubben extends Bank {
@@ -47,7 +48,7 @@ public class Bioklubben extends Bank {
private static final String NAME_SHORT = "bioklubben";
- private static final String URL = "http://bioklubben.sf.se/Start.aspx";
+ private static final String URL = "https://bioklubben.sf.se/Start.aspx";
private static final int BANKTYPE_ID = Bank.BIOKLUBBEN;
@@ -76,9 +77,9 @@ public class Bioklubben extends Bank {
@Override
protected LoginPackage preLogin() throws BankException, IOException {
- urlopen = new Urllib(context);
+ urlopen = new Urllib(context, CertificateReader.getCertificates(context, R.raw.cert_bioklubben));
urlopen.setAllowCircularRedirects(true);
- response = urlopen.open("http://bioklubben.sf.se/Start.aspx");
+ response = urlopen.open(URL);
Document d = Jsoup.parse(response);
Element e = d.getElementById("__VIEWSTATE");
@@ -109,7 +110,7 @@ public class Bioklubben extends Bank {
postData.add(
new BasicNameValuePair("ctl00$ContentPlaceHolder1$LoginUserControl$PasswordTextBox",
getPassword()));
- return new LoginPackage(urlopen, postData, response, "http://bioklubben.sf.se/Start.aspx");
+ return new LoginPackage(urlopen, postData, response, URL);
}
public Urllib login() throws LoginException, BankException, IOException {
@@ -129,7 +130,7 @@ public class Bioklubben extends Bank {
}
urlopen = login();
Document d = Jsoup.parse(urlopen.open(
- "http://bioklubben.sf.se/MyPurchases.aspx?ParentTreeID=1&TreeID=1"));
+ "https://bioklubben.sf.se/MyPurchases.aspx?ParentTreeID=1&TreeID=1"));
Element e = d.getElementById("ctl00_ContentPlaceHolder1_BonusPointsLabel");
if (e == null) {
throw new BankException(
diff --git bankdroid-legacy/src/main/res/raw/cert_bioklubben.pem bankdroid-legacy/src/main/res/raw/cert_bioklubben.pem
new file mode 100644
index 0000000..a01ed1e
--- /dev/null
+++ bankdroid-legacy/src/main/res/raw/cert_bioklubben.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIF4TCCBMmgAwIBAgIQVPm9MeoE7SQFdlULvDppQjANBgkqhkiG9w0BAQsFADBE
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
+R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTYwMjAxMDAwMDAwWhcNMTcwMTMxMjM1
+OTU5WjBqMQswCQYDVQQGEwJTRTEYMBYGA1UECAwPU1RPQ0tIT0xNUyBMw6ROMQ4w
+DAYDVQQHDAVTb2xuYTESMBAGA1UEChQJU0YgQmlvIEFCMQswCQYDVQQLDAJJVDEQ
+MA4GA1UEAxQHKi5zZi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKLUmrPm9g2Z12yVD9jnGgk3C2xrdOYqjfjFGOrU2SfTaI1L8POt2s9YspYcKkFG
+5EB7Iv3aIwL0TccsbWT1PaiVvT7hgU94n5fYjjHlMiVMdPpHunGj9KqO12/zz++e
+Qa8xITx5AW3S7CYHIBqxPIU43/6ukXcmsGe4ngbHxhl7nfWcgWT/qxUA7guWqxON
+KNaNOsw4KeJizxhURT52nf5+dJIZ9j/3x8vu+WC8kJ9LQzKdFuFOZ05/Ivwj+WcI
+SbOOaisxaQCdkFMDtTfWPBX9CjEvAEqYsthFj2trvxZYgvnN6zR7eRdAH2chgrh9
+//ljApp85rzAVClGncBZKq0CAwEAAaOCAqcwggKjMBkGA1UdEQQSMBCCByouc2Yu
+c2WCBXNmLnNlMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIw
+IKAeoByGGmh0dHA6Ly9nbi5zeW1jYi5jb20vZ24uY3JsMIGdBgNVHSAEgZUwgZIw
+gY8GBmeBDAECAjCBhDA/BggrBgEFBQcCARYzaHR0cHM6Ly93d3cuZ2VvdHJ1c3Qu
+Y29tL3Jlc291cmNlcy9yZXBvc2l0b3J5L2xlZ2FsMEEGCCsGAQUFBwICMDUMM2h0
+dHBzOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvcmVwb3NpdG9yeS9sZWdh
+bDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU0m/3
+lvSFP3I8MH0j2oV4m6N8WnwwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
+dHRwOi8vZ24uc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vZ24uc3ltY2Iu
+Y29tL2duLmNydDCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AN3rHSt6DU+mIIuB
+rYFocH4ujp0B1VyIjT0RxM227L7MAAABUp0mwQkAAAQDAEcwRQIgequqjt1sy5zl
+gCK93rW9xs6YxLs1bCfp96HIYhZ49kACIQDhjtfaakCmfkQ9UDMBp7WpE1kA4PFl
+jNIZnsUqdf4meAB1AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAAB
+Up0mvTEAAAQDAEYwRAIgR0W9StBOqzQ85oWMWO6h/P4M+p77PJQrjgdyQlcePVUC
+IHRoUg4Ywdh9ookJITb8K9dn5MGikr7I6om9QwWNBb+6MA0GCSqGSIb3DQEBCwUA
+A4IBAQAlL/o5EhDh5lNkjJkxPzFnX4xuf2/PtyepQmlE9f0/o1ICgUgHDy2Vs2r/
+yCWyjKSl+APsd0AOuKJtxXm9s+TtHDRAysODUVhSQYLjWOZoWrpQ3d0bDhDHhy8S
+3AaqoE65tRXbZHZ7sSB95XpKgPARwn918y1Oe6aTEE8JvSV/cXVyHbng5RB2ddJP
+OFXUmh+/uLgbPQ/V4wPipTbWLDgA+D7XuyQVzCNvhPD4A8w0oBi/HxjjYMdPByoK
+LjVEmYCdw91c/h6Avm9AUK92XGXkNdiML+hBEY2YJQZghH1yz98hbqfm0x5b43GI
+Lk4ymn/K6HZMbtsrXfcWX8N3UmO5
+-----END CERTIFICATE-----
+bioklubben.sf.se:443
commit 13e94fcea34623cfd5d3fa734ef1c855f190f7ba
Author: Robert Högberg
Date: Fri Oct 28 00:27:16 2016 +0200
Remove stray Villabanken logo
diff --git assets/villabanken.psd assets/villabanken.psd
deleted file mode 100644
index 2efedbb..0000000
Binary files assets/villabanken.psd and /dev/null differ
commit 94072b6173bdcbe1f96146cf1587cdc359ea3139
Author: Johan Walles
Date: Thu Oct 27 06:19:09 2016 +0200
Fix empty catch blocks
This should improve the Crashlytics statistics.
diff --git app/src/main/java/com/liato/bankdroid/TimePreference.java app/src/main/java/com/liato/bankdroid/TimePreference.java
index 44586c5..fc13af3 100644
--- app/src/main/java/com/liato/bankdroid/TimePreference.java
+++ app/src/main/java/com/liato/bankdroid/TimePreference.java
@@ -8,6 +8,8 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.TimePicker;
+import timber.log.Timber;
+
public class TimePreference extends DialogPreference {
private int lastValue = 0;
@@ -64,6 +66,7 @@ public class TimePreference extends DialogPreference {
try {
val = Integer.parseInt(defaultValue.toString());
} catch (NumberFormatException e) {
+ Timber.e(e, "TimePreference's defaultValue is not a number");
}
}
diff --git app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
index 7e26254..f289d76 100644
--- app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
+++ app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
@@ -394,6 +394,7 @@ public class AutoRefreshService extends Service {
refreshWidgets = true;
db.disableBank(bank.getDbId());
} catch (BankChoiceException e) {
+ Timber.w(e, "BankChoiceException");
} catch (Exception e) {
Timber.e(e, "An unexpected error occurred while updating bank %s", bank.getShortName());
}
diff --git app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
index 17c19ae..fd0011c 100644
--- app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
+++ app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
@@ -395,6 +395,7 @@ public abstract class BankdroidWidgetProvider extends AppWidgetProvider {
Timber.w(e, "Invalid credentials for bank %s", bank.getShortName());
DBAdapter.disable(bank, context);
} catch (BankChoiceException e) {
+ Timber.w(e, "BankChoiceException");
} catch (IOException e) {
if (NetworkUtils.isInternetAvailable()) {
Timber.e(e, "Could not update bank %s", bank.getShortName());
diff --git app/src/main/java/com/liato/bankdroid/banking/BankFactory.java app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
index b1a8888..9a7ea9c 100644
--- app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
+++ app/src/main/java/com/liato/bankdroid/banking/BankFactory.java
@@ -99,7 +99,7 @@ public class BankFactory {
}
banks.add(bank);
} catch (BankException e) {
- //e.printStackTrace();
+ Timber.w(e, "BankFactory.banksFromDb()");
}
}
c.close();
@@ -168,7 +168,8 @@ public class BankFactory {
account.setAliasfor(c.getString(c.getColumnIndex("aliasfor")));
accounts.add(account);
} catch (ArrayIndexOutOfBoundsException e) {
- // Attempted to load an account without and ID, probably an old Avanza account.
+ // Probably an old Avanza account
+ Timber.w(e, "Attempted to load an account without an ID: %d", bankId);
}
}
c.close();
diff --git app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
index 2de42b7..87a0c1d 100644
--- app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
+++ app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
@@ -236,10 +236,9 @@ public class ColorPickerPreference
}
mValue = color;
setPreviewColor();
- try {
- getOnPreferenceChangeListener().onPreferenceChange(this, color);
- } catch (NullPointerException e) {
-
+ OnPreferenceChangeListener listener = getOnPreferenceChangeListener();
+ if (listener != null) {
+ listener.onPreferenceChange(this, color);
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java
index 2c2e4ce..2ea759a 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/Helpers.java
@@ -142,7 +142,7 @@ public class Helpers {
.getMethod("overridePendingTransition", int.class, int.class);
method.invoke(activity, in, out);
} catch (Exception e) {
- // Can't change animation, so do nothing
+ Timber.w(e, "Can't change animation, so do nothing");
}
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java
index 82ad171..496f9e4 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/LegacyBankHelper.java
@@ -6,6 +6,8 @@ import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;
+import timber.log.Timber;
+
public class LegacyBankHelper {
private static Map legacyProviderReferences;
@@ -39,7 +41,7 @@ public class LegacyBankHelper {
references.put(legacyId, reference);
legacyIds.put(reference, legacyId);
} catch(IllegalAccessException e) {
- //TODO log if provider could not be mapped.
+ Timber.e(e, "Provider could not be mapped");
}
}
legacyProviderReferences = legacyIds;
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java
index b3c620f..fddf1bb 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/Jojo.java
@@ -42,6 +42,7 @@ import java.util.List;
import eu.nullbyte.android.urllib.CertificateReader;
import eu.nullbyte.android.urllib.Urllib;
+import timber.log.Timber;
public class Jojo extends Bank {
@@ -141,6 +142,7 @@ public class Jojo extends Bank {
}
} catch (IOException e) {
// Ignore and defaults to zero
+ Timber.w(e, "Getting Jojo card balance failed");
}
return BigDecimal.ZERO;
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
index d1ece28..6969afa 100644
--- bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/banking/banks/lansforsakringar/Lansforsakringar.java
@@ -130,10 +130,9 @@ public class Lansforsakringar extends Bank {
try {
is.close();
} catch(IOException e) {
- // Ignore
+ Timber.w(e, "Closing JSON stream failed");
}
}
-
}
private T readJsonValue(String url, String postData, Class valueType)
@@ -235,8 +234,7 @@ public class Lansforsakringar extends Bank {
}
account.setTransactions(transactions);
} catch (BankException e) {
- // No transactions for account if this fails.
- // readJsonValue will print the stack trace
+ Timber.e(e, "Failed updating Länsförsäkringar transactions");
}
super.updateComplete();
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java
index 2a87b49..616084c 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertPinningSSLSocketFactory.java
@@ -46,6 +46,8 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager;
+import timber.log.Timber;
+
public class CertPinningSSLSocketFactory extends SSLSocketFactory {
private SSLContext sslcontext = null;
@@ -133,7 +135,9 @@ public class CertPinningSSLSocketFactory extends SSLSocketFactory {
// close the socket before re-throwing the exception
try {
sslsock.close();
- } catch (Exception x) { /*ignore*/ }
+ } catch (Exception e) {
+ Timber.w(e, "Error closing SSL socket (ignored)");
+ }
throw iox;
}
return sslsock;
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertificateReader.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertificateReader.java
index 4bb2e20..99d7338 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertificateReader.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/CertificateReader.java
@@ -5,9 +5,6 @@ import android.content.Context;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
@@ -21,7 +18,7 @@ public class CertificateReader {
public static Certificate[] getCertificates(Context context,
int... rawResCerts) {
- List certificates = new ArrayList();
+ List certificates = new ArrayList<>();
try {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
for (int resId : rawResCerts) {
@@ -43,26 +40,4 @@ public class CertificateReader {
}
return certificates.toArray(new Certificate[certificates.size()]);
}
-
- public static ClientCertificate getClientCertificate(Context context, int rawResCert,
- String password) {
- InputStream is = null;
- try {
- KeyStore keyStore = KeyStore.getInstance("PKCS12");
- is = new BufferedInputStream(context.getResources().openRawResource(rawResCert));
- keyStore.load(is, password.toCharArray());
- return new ClientCertificate(keyStore, password);
- } catch (IOException | NoSuchAlgorithmException | CertificateException | KeyStoreException e) {
- Timber.w(e, "Failed to get client certificate");
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- //noop
- }
- }
- }
- return null;
- }
}
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
index 803be41..2636816 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
@@ -16,6 +16,7 @@
package eu.nullbyte.android.urllib;
+import com.liato.bankdroid.legacy.BuildConfig;
import com.liato.bankdroid.legacy.R;
import com.liato.bankdroid.utils.ExceptionUtils;
@@ -65,8 +66,6 @@ import org.apache.http.util.EntityUtils;
import android.content.Context;
import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.Build;
import android.preference.PreferenceManager;
@@ -396,22 +395,12 @@ public class Urllib {
private String createUserAgentString() {
String appName = mContext.getString(R.string.app_name);
- String packageName = "";
- String appVersion = "";
-
- try {
- PackageInfo packageInfo = mContext.getPackageManager()
- .getPackageInfo(mContext.getPackageName(), PackageManager.GET_CONFIGURATIONS);
- packageName = packageInfo.packageName;
- appVersion = packageInfo.versionName;
- } catch (PackageManager.NameNotFoundException ignore) {
- }
Configuration config = mContext.getResources().getConfiguration();
return String
.format("%1$s/%2$s (%3$s; U; Android %4$s; %5$s-%6$s; %10$s Build/%7$s; %8$s) %9$s %10$s"
, appName
- , appVersion
+ , BuildConfig.VERSION_NAME
, System.getProperty("os.name", "Linux")
, Build.VERSION.RELEASE
, config.locale.getLanguage().toLowerCase()
diff --git config/quality/pmd/pmd-ruleset.xml config/quality/pmd/pmd-ruleset.xml
index 9dbddb2..3109e6b 100644
--- config/quality/pmd/pmd-ruleset.xml
+++ config/quality/pmd/pmd-ruleset.xml
@@ -39,7 +39,6 @@
-
@@ -69,7 +68,6 @@
-
commit 8e477f6eef16910b02b85f66f7a1402a30087bb2 (tag: v1.9.11)
Author: Mathias AÌŠhsberg
Date: Wed Oct 26 21:12:58 2016 +0200
Create release v1.9.11
diff --git CHANGELOG CHANGELOG
index 5d85914..fa02959 100644
--- CHANGELOG
+++ CHANGELOG
@@ -1,10 +1,22 @@
Please view this file on the master branch, on stable branches it's out of date.
-Not yet released
+v1.9.11 (2016-10-26)
* Warn about disabled banks in the transactions list
* Show warning text about disabled banks in the main activity
-* Remove TrustBuddy since they're no longer in business
-* Remove unused class MobilbankenBase
+* Removes support for TrustBuddy since they're no longer in business
+* Removes support for Audi since they require MobiltBankId
+* Removes support for VolvoFinans since they require MobiltBankId
+* Removes support for EasyCard since they require MobiltBankId
+* Removes support for Preem since they require MobiltBankId
+* Removes support for ResursBank since they require MobiltBankId
+* Removes support for Seat since they require MobiltBankId
+* Removes support for Shell since they require MobiltBankId
+* Removes support for Skoda since they require MobiltBankId
+* Removes support for SupremeCard since they require MobiltBankId
+* Removes support for Villabanken since they require MobiltBankId
+* Removes support for Volkswagen since they require MobiltBankId
+* Merged NordnetDirekt with Nordnet.
+* Merged AvanzaMini with Avanza.
v1.9.10.10 (2016-10-17)
* Fixes crash for Amex
commit d42dea167a24ae90c840fcb7d6c0cb386f4db441
Author: Mathias AÌŠhsberg
Date: Wed Oct 26 20:53:40 2016 +0200
Upgrade gradle build tools to latest stable.
diff --git app/build.gradle app/build.gradle
index da46be5..aafa141 100644
--- app/build.gradle
+++ app/build.gradle
@@ -7,8 +7,12 @@ buildscript {
}
dependencies {
- classpath 'io.fabric.tools:gradle:1.+'
classpath "org.ajoberstar:gradle-git:1.5.1"
+
+ // The dynamic version here is explicitly recommended by the Crashlytics docs:
+ // https://docs.fabric.io/android/fabric/integration.html#modify-build-gradle
+ //noinspection GradleDynamicVersion
+ classpath 'io.fabric.tools:gradle:1.+'
}
}
apply plugin: 'com.android.application'
@@ -83,7 +87,7 @@ dependencies {
compile project(':bankdroid-core')
compile 'com.jakewharton:butterknife:6.1.0'
compile 'com.jakewharton.timber:timber:4.3.1'
- compile "com.android.support:appcompat-v7:24.1.1"
+ compile "com.android.support:appcompat-v7:24.2.1"
compile 'com.google.collections:google-collections:1.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
transitive = true;
diff --git bankdroid-legacy/build.gradle bankdroid-legacy/build.gradle
index 943e966..2cda778 100644
--- bankdroid-legacy/build.gradle
+++ bankdroid-legacy/build.gradle
@@ -27,14 +27,14 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':bankdroid-interface')
- compile 'com.android.support:appcompat-v7:24.1.1'
+ compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.jakewharton.timber:timber:4.3.1'
compile ('org.apache.commons:commons-io:1.3.2') {exclude module: 'commons-io'}
compile 'org.jsoup:jsoup:1.7.3'
compile 'com.fasterxml.jackson.core:jackson-core:2.1.0'
compile 'com.fasterxml.jackson.core:jackson-databind:2.1.0'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.1.0'
- compile('org.simpleframework:simple-xml:2.7.+') {
+ compile('org.simpleframework:simple-xml:2.7.1') {
exclude module: 'stax'
exclude module: 'stax-api'
exclude module: 'xpp3'
diff --git build.gradle build.gradle
index 8f0f520..43763d6 100644
--- build.gradle
+++ build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.1'
+ classpath 'com.android.tools.build:gradle:2.2.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git config/quality/lint/lint.xml config/quality/lint/lint.xml
index 8f68763..8195ce2 100644
--- config/quality/lint/lint.xml
+++ config/quality/lint/lint.xml
@@ -1,5 +1,8 @@
+
+
+
@@ -12,8 +15,6 @@
-
-
diff --git tools/update-suppressions.sh tools/update-suppressions.sh
index 363091b..4148ea6 100755
--- tools/update-suppressions.sh
+++ tools/update-suppressions.sh
@@ -21,6 +21,9 @@ function set_lint_suppressions() {
cat > ${LINT_XML} << EOF
+
+
+
EOF
commit f999a2aa8ded6f873c6ab8e8502255e3f7409675
Author: Johan Walles
Date: Tue Oct 25 21:31:33 2016 +0200
Fake Urllib exception stack traces
In Crashlytics we have a lot of stack traces originating in Urllib.
With this change in place, those exceptions will appear to be
originating from whatever bank tried to call Urllib, and it will be
much more obvious in Crashlytics which banks actually have the most
problems.
diff --git bankdroid-legacy/build.gradle bankdroid-legacy/build.gradle
index a5dd3f4..943e966 100644
--- bankdroid-legacy/build.gradle
+++ bankdroid-legacy/build.gradle
@@ -39,4 +39,7 @@ dependencies {
exclude module: 'stax-api'
exclude module: 'xpp3'
}
+
+ testCompile 'junit:junit:4.12'
+ testCompile 'org.mockito:mockito-core:1.10.19'
}
diff --git bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
new file mode 100644
index 0000000..e61097b
--- /dev/null
+++ bankdroid-legacy/src/main/java/com/liato/bankdroid/utils/ExceptionUtils.java
@@ -0,0 +1,67 @@
+package com.liato.bankdroid.utils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+
+import timber.log.Timber;
+
+public class ExceptionUtils {
+ private static final String PREFIX = "com.liato.bankdroid.";
+
+ /**
+ * Take an exception thrown and make it look like it came from Bankdroid.
+ *
+ * Specifically, if Urllib.java, called by Bankdroid code, throws an exception,
+ * rewrite the exception so that it appears as if it was thrown from the
+ * Bankdroid method calling Urllib, but caused by the original Exception.
+ */
+ public static T bankdroidifyException(T exception) {
+ StackTraceElement[] bankdroidifiedStacktrace =
+ bankdroidifyStacktrace(exception.getStackTrace());
+ if (bankdroidifiedStacktrace.length == exception.getStackTrace().length) {
+ // Unable to bankdroidify stacktrace, never mind
+ return exception;
+ }
+
+ T returnMe;
+ try {
+ returnMe = (T)exception.getClass().getConstructor(String.class)
+ .newInstance(exception.getMessage());
+ } catch (InstantiationException e) {
+ Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
+ return exception;
+ } catch (InvocationTargetException e) {
+ Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
+ return exception;
+ } catch (IllegalAccessException e) {
+ Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
+ return exception;
+ } catch (NoSuchMethodException e) {
+ Timber.e(e, "Unable to Bankdroidify exception of type %s", exception.getClass());
+ return exception;
+ }
+
+ returnMe.initCause(exception);
+
+ returnMe.setStackTrace(bankdroidifiedStacktrace);
+
+ return returnMe;
+ }
+
+ /**
+ * Remove all initial non-Bankdroid frames from a stack.
+ *
+ * @return A copy of rawStack but with the initial non-Bankdroid frames removed
+ */
+ private static StackTraceElement[] bankdroidifyStacktrace(final StackTraceElement[] rawStack) {
+ for (int i = 0; i < rawStack.length; i++) {
+ StackTraceElement stackTraceElement = rawStack[i];
+ if (stackTraceElement.getClassName().startsWith(PREFIX)) {
+ return Arrays.copyOfRange(rawStack, i, rawStack.length);
+ }
+ }
+
+ // No Bankdroid stack frames found, never mind
+ return rawStack;
+ }
+}
diff --git bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
index 2cc5e36..803be41 100644
--- bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
+++ bankdroid-legacy/src/main/java/eu/nullbyte/android/urllib/Urllib.java
@@ -17,6 +17,7 @@
package eu.nullbyte.android.urllib;
import com.liato.bankdroid.legacy.R;
+import com.liato.bankdroid.utils.ExceptionUtils;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.HttpEntity;
@@ -146,7 +147,11 @@ public class Urllib {
}
public String open(String url) throws ClientProtocolException, IOException {
- return this.open(url, new ArrayList());
+ try {
+ return this.open(url, new ArrayList());
+ } catch (IOException e) {
+ throw ExceptionUtils.bankdroidifyException(e);
+ }
}
public String post(String url) throws ClientProtocolException, IOException {
@@ -155,7 +160,11 @@ public class Urllib {
public String open(String url, List postData)
throws ClientProtocolException, IOException {
- return open(url, postData, false);
+ try {
+ return open(url, postData, false);
+ } catch (IOException e) {
+ throw ExceptionUtils.bankdroidifyException(e);
+ }
}
public String open(String url, List postData, boolean forcePost)
@@ -171,7 +180,11 @@ public class Urllib {
boolean forcePost) throws ClientProtocolException, IOException {
HttpEntity entity = (postData == null || postData.isEmpty()) && !forcePost ? null
: new UrlEncodedFormEntity(postData, this.charset);
- return openAsHttpResponse(url, entity, forcePost);
+ try {
+ return openAsHttpResponse(url, entity, forcePost);
+ } catch (IOException e) {
+ throw ExceptionUtils.bankdroidifyException(e);
+ }
}
public HttpResponse openAsHttpResponse(String url, boolean forcePost)
@@ -181,10 +194,14 @@ public class Urllib {
public HttpResponse openAsHttpResponse(String url, HttpEntity entity, boolean forcePost)
throws ClientProtocolException, IOException {
- if ((entity == null) && !forcePost) {
- return openAsHttpResponse(url, entity, HttpMethod.GET);
- } else {
- return openAsHttpResponse(url, entity, HttpMethod.POST);
+ try {
+ if ((entity == null) && !forcePost) {
+ return openAsHttpResponse(url, entity, HttpMethod.GET);
+ } else {
+ return openAsHttpResponse(url, entity, HttpMethod.POST);
+ }
+ } catch (IOException e) {
+ throw ExceptionUtils.bankdroidifyException(e);
}
}
@@ -273,8 +290,12 @@ public class Urllib {
public InputStream openStream(String url, String postData, boolean forcePost)
throws ClientProtocolException, IOException {
- return openStream(url, postData != null ? new StringEntity(postData, this.charset) : null,
- forcePost);
+ try {
+ return openStream(url, postData != null ? new StringEntity(postData, this.charset) : null,
+ forcePost);
+ } catch (IOException e) {
+ throw ExceptionUtils.bankdroidifyException(e);
+ }
}
public InputStream openStream(String url, HttpEntity postData, boolean forcePost)
diff --git bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
new file mode 100644
index 0000000..803dc5f
--- /dev/null
+++ bankdroid-legacy/src/test/java/com/liato/bankdroid/utils/ExceptionUtilsTest.java
@@ -0,0 +1,41 @@
+package com.liato.bankdroid.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import eu.nullbyte.android.urllib.Urllib;
+
+public class ExceptionUtilsTest {
+ @Test
+ @SuppressWarnings("PMD") // This is for the stack trace printing, we really want to do it here
+ public void bankdroidifyException() throws Exception {
+ Exception raw = null;
+ try {
+ new Urllib(null);
+ Assert.fail("Exception expected");
+ } catch (NullPointerException e) {
+ raw = e;
+ }
+
+ // Print stack traces, useful if the tests fail
+ System.err.println("Before:");
+ raw.printStackTrace();
+
+ System.err.println();
+ System.err.println("After:");
+ Exception bankdroidified = ExceptionUtils.bankdroidifyException(raw);
+ bankdroidified.printStackTrace();
+
+ Assert.assertFalse("Test setup: Top frame of initial exception shouldn't be in Bankdroid",
+ raw.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+
+ Assert.assertTrue("Top frame of bankdroidified exception should be in Bankdroid",
+ bankdroidified.getStackTrace()[0].getClassName().startsWith("com.liato.bankdroid."));
+
+ // Verify that e is the cause of bankdroidified
+ Assert.assertSame(raw, bankdroidified.getCause());
+
+ // Verify that re-bankdroidifying is a no-op
+ Assert.assertSame(bankdroidified, ExceptionUtils.bankdroidifyException(bankdroidified));
+ }
+}
commit b75ce9788c33d9d6ef70bfe6fbb3fae8647f9232
Author: Johan Walles
Date: Thu Oct 20 20:04:51 2016 +0200
Show warning for disabled banks
Before this change, in the banks list in the main UI, disabled banks
were marked with a warning icon.
This change adds to that warning icon a text describing what's actually
going on and what the user can do about it.
Before starting to work on this I fixed all Android Lint reported
warnings in the .java and .xml files I had to change, and re-enabled
those warnings.
One of those warnings was about using sp rather than dp for text. I
suppressed that warning for the widgets, but heeded it in all other
places. This results in a UI that better adapts to the user's font size
preferences.
The UI changes I have tested with both "small" and "huge" font size,
and it looks fine.
diff --git CHANGELOG CHANGELOG
index 858714a..5d85914 100644
--- CHANGELOG
+++ CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
Not yet released
* Warn about disabled banks in the transactions list
+* Show warning text about disabled banks in the main activity
* Remove TrustBuddy since they're no longer in business
* Remove unused class MobilbankenBase
diff --git app/src/main/java/com/liato/bankdroid/adapters/AccountsAdapter.java app/src/main/java/com/liato/bankdroid/adapters/AccountsAdapter.java
index af4e6ec..9413be0 100644
--- app/src/main/java/com/liato/bankdroid/adapters/AccountsAdapter.java
+++ app/src/main/java/com/liato/bankdroid/adapters/AccountsAdapter.java
@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -42,50 +43,30 @@ public class AccountsAdapter extends BaseAdapter {
public final static int VIEWTYPE_EMPTY = 2;
- SharedPreferences prefs;
+ private final SharedPreferences prefs;
private ArrayList banks;
- private Context context;
-
- private LayoutInflater inflater;
+ private final LayoutInflater inflater;
private boolean showHidden;
public AccountsAdapter(Context context, boolean showHidden) {
- this.context = context;
- this.banks = new ArrayList