diff --git a/SWADroid/gen/es/ugr/swad/swadroid/R.java b/SWADroid/gen/es/ugr/swad/swadroid/R.java index 39361877..1d3521c3 100644 --- a/SWADroid/gen/es/ugr/swad/swadroid/R.java +++ b/SWADroid/gen/es/ugr/swad/swadroid/R.java @@ -160,8 +160,8 @@ public final class R { public static final int app_name=0x7f070000; public static final int assignment=0x7f070034; public static final int author_preferences=0x7f070019; - public static final int blogTitle=0x7f070070; - public static final int blogURL=0x7f07006a; + public static final int blogTitle=0x7f070071; + public static final int blogURL=0x7f07006b; public static final int cancelMsg=0x7f070040; public static final int cleanDatabaseMsg=0x7f070063; public static final int cleanDatabaseTitle_menu=0x7f070016; @@ -181,24 +181,26 @@ public final class R { public static final int errorTimeoutMsg=0x7f07005b; public static final int evaluation=0x7f070033; public static final int examAnnouncement=0x7f07002c; - public static final int facebookTitle=0x7f07006d; - public static final int facebookURL=0x7f070067; + public static final int facebookTitle=0x7f07006e; + public static final int facebookURL=0x7f070068; public static final int falseMsg=0x7f07003e; public static final int firstRunMsg=0x7f070055; + public static final int footMessageMsg=0x7f070075; public static final int forumReply=0x7f070030; public static final int fromMsg=0x7f070037; - public static final int googlePlusTitle=0x7f07006e; - public static final int googlePlusURL=0x7f070068; + public static final int googlePlusTitle=0x7f07006f; + public static final int googlePlusURL=0x7f070069; public static final int initialDialogTitle=0x7f070056; public static final int loginModuleLabel=0x7f070001; public static final int loginProgressDescription=0x7f07001d; public static final int loginProgressTitle=0x7f07001c; public static final int loginSuccessfulMsg=0x7f07002b; public static final int loginTitle_menu=0x7f07001b; - public static final int mailingListTitle=0x7f07006f; - public static final int mailingListURL=0x7f070069; - public static final int marketTitle=0x7f070071; + public static final int mailingListTitle=0x7f070070; + public static final int mailingListURL=0x7f07006a; + public static final int marketTitle=0x7f070072; public static final int marketURL=0x7f070065; + public static final int marketWebURL=0x7f070066; public static final int marksFile=0x7f07002d; public static final int message=0x7f07002f; public static final int messageSendErrorMsg=0x7f07005e; @@ -215,8 +217,8 @@ public final class R { public static final int noQuestionsPluggableTestsDownloadMsg=0x7f070045; public static final int noSubjectMsg=0x7f070039; public static final int notice=0x7f07002e; - public static final int notificationsAlertMsg=0x7f070073; - public static final int notificationsAlertTitle=0x7f070072; + public static final int notificationsAlertMsg=0x7f070074; + public static final int notificationsAlertTitle=0x7f070073; public static final int notificationsDownloadedMsg=0x7f070023; public static final int notificationsEmptyListMsg=0x7f070022; public static final int notificationsModuleLabel=0x7f070002; @@ -255,9 +257,9 @@ public final class R { public static final int testsModuleLabel=0x7f070004; public static final int title_error_dialog=0x7f070006; public static final int trueMsg=0x7f07003d; - public static final int twitterTitle=0x7f07006c; - public static final int twitterURL=0x7f070066; - public static final int twitterUser=0x7f07006b; + public static final int twitterTitle=0x7f07006d; + public static final int twitterURL=0x7f070067; + public static final int twitterUser=0x7f07006c; public static final int unknownNotification=0x7f070036; public static final int upgradeMsg=0x7f070057; public static final int upgradeMsg_DB=0x7f07002a; diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml index 6401e7f0..bac795f8 100644 --- a/SWADroid/res/values-es/strings.xml +++ b/SWADroid/res/values-es/strings.xml @@ -119,4 +119,5 @@ TwitterFacebookGoogle+Lista de correoBlogAndroid Market Nuevas notificaciones nuevas notificaciones + Enviado desde \ No newline at end of file diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml index b8423ab9..bb8518c7 100644 --- a/SWADroid/res/values/strings.xml +++ b/SWADroid/res/values/strings.xml @@ -114,7 +114,7 @@ the e-learning platform SWAD.\nGet it for free here: https://market.android.com/details?id=es.ugr.swad.swadroid market://details?id=es.ugr.swad.swadroid - https://twitter.com/#!/SWADroid + https://play.google.com/store/apps/details?id=es.ugr.swad.swadroidhttps://twitter.com/#!/SWADroid https://www.facebook.com/SWADroid https://plus.google.com/115615684349730524355/posts https://groups.google.com/forum/#!forum/swadroid @@ -123,7 +123,8 @@ Facebook Google+ Mailing list - BlogAndroid MarketNew notificationsnew notifications + BlogAndroid MarketNew notificationsnew notificationsSended from + \ No newline at end of file diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java index f3a63548..5c9fec88 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java @@ -161,8 +161,14 @@ public class Messages extends Module { EditText bd = (EditText) messageDialog.findViewById(R.id.message_body_text); body = bd.getText().toString(); + body = body.replaceAll("\n", "
"); + body = body + "

"+ getString(R.string.footMessageMsg) + " " + getString(R.string.app_name) + + "
" + getString(R.string.marketWebURL); + //body = body + "

"+ getString(R.string.footMessageMsg) + " " + getString(R.string.app_name) + ""; } + /* (non-Javadoc) * @see es.ugr.swad.swadroid.modules.Module#requestService() */ @@ -193,10 +199,8 @@ public class Messages extends Module { String surname1 = pii.getProperty("userSurname1").toString(); String surname2 = pii.getProperty("userSurname2").toString(); - receiversNames += firstname + " " + surname1 + " " + surname2 + " (" + nickname + ")"; - if(i < csSize) { - receiversNames += "\n"; - } + receiversNames += "\n"; + receiversNames += firstname + " " + surname1 + " " + surname2 + " (" + nickname + ")"; } } @@ -222,7 +226,7 @@ public class Messages extends Module { */ @Override protected void postConnect() { - String messageSended = getString(R.string.messageSendedMsg) + ":\n" + receiversNames; + String messageSended = getString(R.string.messageSendedMsg) + ":" + receiversNames; Toast.makeText(this, messageSended, Toast.LENGTH_LONG).show(); Log.i(TAG, messageSended); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java index f1fa4a47..7b52f8f8 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java @@ -101,6 +101,8 @@ public abstract class Module extends MenuActivity { */ public static final String TAG = Global.APP_TAG + " Module"; + private static KeepAliveHttpsTransportSE connection; + /** * Connects to SWAD and gets user data. * @throws NoSuchAlgorithmException @@ -405,7 +407,7 @@ public abstract class Module extends MenuActivity { * Use of KeepAliveHttpsTransport deals with the problems with the Android ssl libraries having trouble * with certificates and certificate authorities somehow messing up connecting/needing reconnects. */ - KeepAliveHttpsTransportSE connection = new KeepAliveHttpsTransportSE(URL, 443, "", TIMEOUT); + connection = new KeepAliveHttpsTransportSE(URL, 443, "", TIMEOUT); SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); System.setProperty("http.keepAlive", "false"); envelope.setOutputSoapObject(request); @@ -575,6 +577,9 @@ public abstract class Module extends MenuActivity { error(errorMsg); /*if(isDebuggable) { e.printStackTrace(); + connection.debug = true; + Log.d(TAG, connection.requestDump.toString()); + Log.d(TAG, connection.responseDump.toString()); }*/ setResult(RESULT_CANCELED);