From 18990acd0a75a780168eaedb7c2ff6ac722cdc22 Mon Sep 17 00:00:00 2001 From: Felix Bechstein Date: Mon, 18 Jan 2010 22:27:58 +0100 Subject: [PATCH] fix more refs to Connector.java --- .../websms/connector/arcor/ConnectorArcor.java | 2 +- .../connector/cherrysms/ConnectorCherrySMS.java | 2 +- connectors/gmx/AndroidManifest.xml | 2 +- .../websms/connector/gmx/CommandReceiverGMX.java | 115 --------------------- .../android/websms/connector/gmx/ConnectorGMX.java | 103 ++++++++++++------ connectors/innosend/AndroidManifest.xml | 2 +- connectors/innosend/res/drawable/icon.png | Bin 0 -> 2574 bytes .../res/values/connector_innosend_strings.xml | 1 + .../connector/innosend/ConnectorInnosend.java | 2 + connectors/o2/AndroidManifest.xml | 2 +- connectors/o2/res/drawable/icon.png | Bin 0 -> 2574 bytes .../android/websms/connector/o2/ConnectorO2.java | 1 + connectors/sipgate/AndroidManifest.xml | 2 +- connectors/sipgate/res/drawable/icon.png | Bin 0 -> 2574 bytes .../websms/connector/sipgate/ConnectorSipgate.java | 1 + .../websms/connector/sloono/ConnectorSloono.java | 5 +- connectors/test/AndroidManifest.xml | 2 +- ...CommandReceiverTest.java => ConnectorTest.java} | 16 +-- 18 files changed, 97 insertions(+), 161 deletions(-) delete mode 100644 connectors/gmx/src/de/ub0r/android/websms/connector/gmx/CommandReceiverGMX.java create mode 100644 connectors/innosend/res/drawable/icon.png create mode 100644 connectors/o2/res/drawable/icon.png create mode 100644 connectors/sipgate/res/drawable/icon.png rename connectors/test/src/de/ub0r/android/websms/connector/test/{CommandReceiverTest.java => ConnectorTest.java} (89%) diff --git a/connectors/arcor/src/de/ub0r/android/websms/connector/arcor/ConnectorArcor.java b/connectors/arcor/src/de/ub0r/android/websms/connector/arcor/ConnectorArcor.java index 58236ac..f3c1693 100644 --- a/connectors/arcor/src/de/ub0r/android/websms/connector/arcor/ConnectorArcor.java +++ b/connectors/arcor/src/de/ub0r/android/websms/connector/arcor/ConnectorArcor.java @@ -45,7 +45,7 @@ import de.ub0r.android.websms.connector.common.WebSMSException; * * @author lado */ -public class ConnectorArcor extends CommandReceiver { +public class ConnectorArcor extends Connector { /** Preference's name: arcor username. */ private static final String PREFS_USER_ARCOR = "user_arcor"; diff --git a/connectors/cherrysms/src/de/ub0r/android/websms/connector/cherrysms/ConnectorCherrySMS.java b/connectors/cherrysms/src/de/ub0r/android/websms/connector/cherrysms/ConnectorCherrySMS.java index 635ec7d..382b8a7 100644 --- a/connectors/cherrysms/src/de/ub0r/android/websms/connector/cherrysms/ConnectorCherrySMS.java +++ b/connectors/cherrysms/src/de/ub0r/android/websms/connector/cherrysms/ConnectorCherrySMS.java @@ -34,7 +34,7 @@ import de.ub0r.android.websms.connector.common.WebSMSException; * * @author flx */ -public class ConnectorCherrySMS extends CommandReceiver { +public class ConnectorCherrySMS extends Connector { /** Tag for output. */ private static final String TAG = "WebSMS.cherry"; diff --git a/connectors/gmx/AndroidManifest.xml b/connectors/gmx/AndroidManifest.xml index 8f1f747..c451e14 100644 --- a/connectors/gmx/AndroidManifest.xml +++ b/connectors/gmx/AndroidManifest.xml @@ -49,7 +49,7 @@ - diff --git a/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/CommandReceiverGMX.java b/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/CommandReceiverGMX.java deleted file mode 100644 index 0b18fd0..0000000 --- a/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/CommandReceiverGMX.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2010 Felix Bechstein - * - * This file is part of WebSMS. - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see . - */ -package de.ub0r.android.websms.connector.gmx; - -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.util.Log; -import de.ub0r.android.websms.connector.common.Connector; -import de.ub0r.android.websms.connector.common.ConnectorSpec; -import de.ub0r.android.websms.connector.common.WebSMSException; -import de.ub0r.android.websms.connector.common.ConnectorSpec.SubConnectorSpec; - -/** - * Receives commands coming as broadcast from WebSMS. - * - * @author flx - */ -public class CommandReceiverGMX extends CommandReceiver { - /** Tag for debug output. */ - private static final String TAG = "WebSMS.GMX"; - - /** Preferences intent action. */ - private static final String PREFS_INTENT_ACTION = "de.ub0r.android." - + "websms.connectors.gmx.PREFS"; - - /** - * {@inheritDoc} - */ - @Override - public final ConnectorSpec initSpec(final Context context) { - final String name = context.getString(R.string.connector_gmx_name); - ConnectorSpec c = new ConnectorSpec(TAG, name); - c.setAuthor(// . - context.getString(R.string.connector_gmx_author)); - c.setBalance(null); - c.setPrefsIntent(PREFS_INTENT_ACTION); - c.setPrefsTitle(context.getString(R.string.connector_gmx_preferences)); - c.setCapabilities(ConnectorSpec.CAPABILITIES_BOOSTRAP - | ConnectorSpec.CAPABILITIES_UPDATE - | ConnectorSpec.CAPABILITIES_SEND); - c.addSubConnector(TAG, c.getName(), - SubConnectorSpec.FEATURE_MULTIRECIPIENTS - | SubConnectorSpec.FEATURE_CUSTOMSENDER - | SubConnectorSpec.FEATURE_SENDLATER); - return c; - } - - /** - * {@inheritDoc} - */ - @Override - public final ConnectorSpec updateSpec(final Context context, - final ConnectorSpec connectorSpec) { - final SharedPreferences p = PreferenceManager - .getDefaultSharedPreferences(context); - if (p.getBoolean(Preferences.PREFS_ENABLED, false)) { - if (p.getString(Preferences.PREFS_MAIL, "").length() > 0 - && p.getString(Preferences.PREFS_PASSWORD, "") // . - .length() > 0) { - connectorSpec.setReady(); - } else { - connectorSpec.setStatus(ConnectorSpec.STATUS_ENABLED); - } - } else { - connectorSpec.setStatus(ConnectorSpec.STATUS_INACTIVE); - } - return connectorSpec; - } - - /** - * {@inheritDoc} - */ - @Override - protected final void doBootstrap(final Intent intent) - throws WebSMSException { - // do nothing by default - Log.d(TAG, "bootstrap"); - } - - /** - * {@inheritDoc} - */ - @Override - protected final void doUpdate(final Intent intent) throws WebSMSException { - // do nothing by default - Log.d(TAG, "update"); - } - - /** - * {@inheritDoc} - */ - @Override - protected final void doSend(final Intent intent) throws WebSMSException { - // do nothing by default - Log.d(TAG, "send"); - } -} diff --git a/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/ConnectorGMX.java b/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/ConnectorGMX.java index 1b41e82..4862d2d 100644 --- a/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/ConnectorGMX.java +++ b/connectors/gmx/src/de/ub0r/android/websms/connector/gmx/ConnectorGMX.java @@ -24,12 +24,16 @@ import java.net.HttpURLConnection; import java.net.URL; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.preference.PreferenceManager; import android.text.format.DateFormat; import android.util.Log; +import de.ub0r.android.websms.connector.common.Connector; +import de.ub0r.android.websms.connector.common.ConnectorSpec; import de.ub0r.android.websms.connector.common.WebSMSException; +import de.ub0r.android.websms.connector.common.ConnectorSpec.SubConnectorSpec; /** * AsyncTask to manage IO to GMX API. @@ -40,16 +44,11 @@ public class ConnectorGMX extends Connector { /** Tag for output. */ private static final String TAG = "WebSMS.GMX"; - /** Preference's name: mail. */ - static final String PREFS_MAIL = "gmx_mail"; - /** Preference's name: username. */ - static final String PREFS_USER = "gmx_user"; - /** Preference's name: user's password - gmx. */ - static final String PREFS_PASSWORD = "gmx_password"; - /** Preference's name: gmx hostname id. */ - private static final String PREFS_GMX_HOST = "gmx_host"; + /** Preferences intent action. */ + private static final String PREFS_INTENT_ACTION = "de.ub0r.android." + + "websms.connectors.gmx.PREFS"; - /** Custom Dateformater. */ + /** Custom {@link DateFormat}. */ private static final String DATEFORMAT = "yyyy-MM-dd kk-mm-00"; /** Target host. */ @@ -66,14 +65,6 @@ public class ConnectorGMX extends Connector { /** Target version of protocol. */ private static final String TARGET_PROTOVERSION = "1.13.03"; - /** ID of mail in array. */ - static final int ID_MAIL = 1; - /** ID of password in array. */ - static final int ID_PW = 2; - - /** Number of IDs in array for bootstrap. */ - static final int IDS_BOOTSTR = 3; - /** Result: ok. */ private static final int RSLT_OK = 0; /** Result: wrong customerid/password. */ @@ -85,22 +76,76 @@ public class ConnectorGMX extends Connector { /** Result: sender is unregistered by gmx. */ private static final int RSLT_UNREGISTERED_SENDER = 71; - /** mail. */ - private static String mail; - /** password. */ - private static String pw; + /** + * {@inheritDoc} + */ + @Override + public final ConnectorSpec initSpec(final Context context) { + final String name = context.getString(R.string.connector_gmx_name); + ConnectorSpec c = new ConnectorSpec(TAG, name); + c.setAuthor(// . + context.getString(R.string.connector_gmx_author)); + c.setBalance(null); + c.setPrefsIntent(PREFS_INTENT_ACTION); + c.setPrefsTitle(context.getString(R.string.connector_gmx_preferences)); + c.setCapabilities(ConnectorSpec.CAPABILITIES_BOOSTRAP + | ConnectorSpec.CAPABILITIES_UPDATE + | ConnectorSpec.CAPABILITIES_SEND); + c.addSubConnector(TAG, c.getName(), + SubConnectorSpec.FEATURE_MULTIRECIPIENTS + | SubConnectorSpec.FEATURE_CUSTOMSENDER + | SubConnectorSpec.FEATURE_SENDLATER); + return c; + } + + /** + * {@inheritDoc} + */ + @Override + public final ConnectorSpec updateSpec(final Context context, + final ConnectorSpec connectorSpec) { + final SharedPreferences p = PreferenceManager + .getDefaultSharedPreferences(context); + if (p.getBoolean(Preferences.PREFS_ENABLED, false)) { + if (p.getString(Preferences.PREFS_MAIL, "").length() > 0 + && p.getString(Preferences.PREFS_PASSWORD, "") // . + .length() > 0) { + connectorSpec.setReady(); + } else { + connectorSpec.setStatus(ConnectorSpec.STATUS_ENABLED); + } + } else { + connectorSpec.setStatus(ConnectorSpec.STATUS_INACTIVE); + } + return connectorSpec; + } + + /** + * {@inheritDoc} + */ + @Override + protected final void doBootstrap(final Intent intent) + throws WebSMSException { + // do nothing by default + Log.d(TAG, "bootstrap"); + } - /** Need to bootstrap? */ - private static boolean needBootstrap = false; + /** + * {@inheritDoc} + */ + @Override + protected final void doUpdate(final Intent intent) throws WebSMSException { + // do nothing by default + Log.d(TAG, "update"); + } /** - * Create a GMX Connector. - * - * @param c - * context + * {@inheritDoc} */ - ConnectorGMX(final Context c) { - super(c); + @Override + protected final void doSend(final Intent intent) throws WebSMSException { + // do nothing by default + Log.d(TAG, "send"); } /** diff --git a/connectors/innosend/AndroidManifest.xml b/connectors/innosend/AndroidManifest.xml index eec21be..e4e574c 100644 --- a/connectors/innosend/AndroidManifest.xml +++ b/connectors/innosend/AndroidManifest.xml @@ -43,7 +43,7 @@ - diff --git a/connectors/innosend/res/drawable/icon.png b/connectors/innosend/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6 GIT binary patch literal 2574 zcwPYx3i0)cP)Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc;(H<$!ABY&gBy1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)Hpq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7 zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e` zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC zy zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7! z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(Rb|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aFK zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`< z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+OzY^c-M9@+fz=G`qa@v4sF5u-2289-#$**LWnyNNDwDf1( zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp| z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_SmOtclS?KWk2VYE zM*oS<=C483XckW?GN|1jfh3Ro(h WebSMS Connector: Innosend 0.1 + Create account IP-blocking active Sender missing Parameter is missing: missing type diff --git a/connectors/innosend/src/de/ub0r/android/websms/connector/innosend/ConnectorInnosend.java b/connectors/innosend/src/de/ub0r/android/websms/connector/innosend/ConnectorInnosend.java index 5edca48..e064a68 100644 --- a/connectors/innosend/src/de/ub0r/android/websms/connector/innosend/ConnectorInnosend.java +++ b/connectors/innosend/src/de/ub0r/android/websms/connector/innosend/ConnectorInnosend.java @@ -25,8 +25,10 @@ import java.util.ArrayList; import org.apache.http.HttpResponse; import org.apache.http.message.BasicNameValuePair; +import android.R; import android.text.format.DateFormat; import android.util.Log; +import de.ub0r.android.websms.connector.common.Connector; import de.ub0r.android.websms.connector.common.WebSMSException; /** diff --git a/connectors/o2/AndroidManifest.xml b/connectors/o2/AndroidManifest.xml index 4d6f219..ffa9f48 100644 --- a/connectors/o2/AndroidManifest.xml +++ b/connectors/o2/AndroidManifest.xml @@ -43,7 +43,7 @@ - diff --git a/connectors/o2/res/drawable/icon.png b/connectors/o2/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6 GIT binary patch literal 2574 zcwPYx3i0)cP)Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc;(H<$!ABY&gBy1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)Hpq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7 zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e` zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC zy zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7! z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(Rb|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aFK zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`< z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+OzY^c-M9@+fz=G`qa@v4sF5u-2289-#$**LWnyNNDwDf1( zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp| z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_SmOtclS?KWk2VYE zM*oS<=C483XckW?GN|1jfh3Ro(h - diff --git a/connectors/sipgate/res/drawable/icon.png b/connectors/sipgate/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6 GIT binary patch literal 2574 zcwPYx3i0)cP)Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc;(H<$!ABY&gBy1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)Hpq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7 zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e` zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC zy zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7! z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(Rb|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aFK zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`< z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+OzY^c-M9@+fz=G`qa@v4sF5u-2289-#$**LWnyNNDwDf1( zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp| z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_SmOtclS?KWk2VYE zM*oS<=C483XckW?GN|1jfh3Ro(h - diff --git a/connectors/test/src/de/ub0r/android/websms/connector/test/CommandReceiverTest.java b/connectors/test/src/de/ub0r/android/websms/connector/test/ConnectorTest.java similarity index 89% rename from connectors/test/src/de/ub0r/android/websms/connector/test/CommandReceiverTest.java rename to connectors/test/src/de/ub0r/android/websms/connector/test/ConnectorTest.java index e19b6d2..4186d66 100644 --- a/connectors/test/src/de/ub0r/android/websms/connector/test/CommandReceiverTest.java +++ b/connectors/test/src/de/ub0r/android/websms/connector/test/ConnectorTest.java @@ -35,7 +35,7 @@ import de.ub0r.android.websms.connector.common.ConnectorSpec.SubConnectorSpec; * * @author flx */ -public class CommandReceiverTest extends CommandReceiver { +public class ConnectorTest extends Connector { /** Tag for debug output. */ private static final String TAG = "WebSMS.test"; @@ -92,13 +92,13 @@ public class CommandReceiverTest extends CommandReceiver { if (action == null) { return; } - if (CommandReceiver.ACTION_CONNECTOR_UPDATE.equals(action)) { + if (Connector.ACTION_CONNECTOR_UPDATE.equals(action)) { this.sendInfo(context, null, null); - } else if (CommandReceiver.ACTION_RUN_SEND.equals(action)) { + } else if (Connector.ACTION_RUN_SEND.equals(action)) { final ConnectorCommand command = new ConnectorCommand(intent); if (command.getType() == ConnectorCommand.TYPE_SEND) { final ConnectorSpec origSpecs = new ConnectorSpec(intent); - final ConnectorSpec specs = getSpecs(context); + final ConnectorSpec specs = this.getSpecs(context); if (specs.getID().equals(origSpecs.getID()) && specs.hasStatus(ConnectorSpec.STATUS_READY)) { // check internal status @@ -117,11 +117,11 @@ public class CommandReceiverTest extends CommandReceiver { } } } else if (// . - CommandReceiver.ACTION_RUN_BOOSTRAP.equals(action)) { - final ConnectorSpec specs = getSpecs(context); + Connector.ACTION_RUN_BOOSTRAP.equals(action)) { + final ConnectorSpec specs = this.getSpecs(context); this.sendInfo(context, specs, null); - } else if (CommandReceiver.ACTION_RUN_UPDATE.equals(action)) { - final ConnectorSpec specs = getSpecs(context); + } else if (Connector.ACTION_RUN_UPDATE.equals(action)) { + final ConnectorSpec specs = this.getSpecs(context); specs.setBalance("13,37\u20AC"); this.sendInfo(context, specs, null); } -- 2.11.4.GIT