Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 28 Wiki Activity

Merge branch 'develop' of https://hrguez@github.com/Amab/SWADroid.git

Browse Source 
into develop

Conflicts:
	SWADroid/gen/es/ugr/swad/swadroid/R.java
This commit is contained in:
Helena Rodriguez 2012-05-21 12:59:14 +02:00
commit 6d86cf18b6
10 changed files with 84 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ SWADroid/.DS_Store
SWADroid/gen/es/ugr/swad/swadroid/BuildConfig.java
SWADroid/gen/es/ugr/swad/swadroid/R.java
SWADroid/gen/com/google/zxing/client/android/R.java
.DS_Store

5
HISTORY.md
View File

@ -1,3 +1,8 @@
## 0.8.1 (2012-05-20)
* Fixed closed cursor access exception on Android 4.x platforms
* Added message replys from open notifications
## 0.8 (2012-05-01)
* Added automatic synchronization of notifications

BIN
SWADroid.apk
View File

Binary file not shown.

4
SWADroid/AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid"
android:installLocation="auto"
android:versionCode="36"
android:versionName="0.8" >
android:versionCode="37"
android:versionName="0.8.1" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

412
SWADroid/gen/es/ugr/swad/swadroid/R.java
View File

@ -1,412 +0,0 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package es.ugr.swad.swadroid;
public final class R {
public static final class array {
public static final int attendanceMenuItems=0x7f080004;
public static final int functions=0x7f080000;
public static final int testAnswerTypes=0x7f080002;
public static final int testAnswerTypesNames=0x7f080003;
public static final int testMenuItems=0x7f080001;
}
public static final class attr {
}
public static final class color {
public static final int background=0x7f060006;
public static final int foreground1=0x7f060004;
public static final int foreground2=0x7f060005;
public static final int green=0x7f060001;
public static final int possible_result_points=0x7f060012;
public static final int red=0x7f060000;
public static final int result_image_border=0x7f06000d;
public static final int result_minor_text=0x7f06000a;
public static final int result_points=0x7f06000e;
public static final int result_text=0x7f06000b;
public static final int result_view=0x7f060007;
public static final int status_text=0x7f06000c;
public static final int title_background=0x7f060002;
public static final int title_separator=0x7f060008;
public static final int title_text=0x7f060003;
public static final int transparent=0x7f060009;
public static final int viewfinder_frame=0x7f06000f;
public static final int viewfinder_laser=0x7f060010;
public static final int viewfinder_mask=0x7f060011;
}
public static final class drawable {
public static final int announce=0x7f020000;
public static final int back=0x7f020001;
public static final int blackboard=0x7f020002;
public static final int btn_bg_pressed=0x7f020003;
public static final int btn_bg_selected=0x7f020004;
public static final int btn_check_buttonless_on=0x7f020005;
public static final int desk=0x7f020006;
public static final int erroricon=0x7f020007;
public static final int file=0x7f020008;
public static final int folder=0x7f020009;
public static final int folderusers=0x7f02000a;
public static final int forum=0x7f02000b;
public static final int forward=0x7f02000c;
public static final int grades=0x7f02000d;
public static final int home=0x7f02000e;
public static final int ic_launcher_swadroid=0x7f02000f;
public static final int ic_menu_star=0x7f020010;
public static final int imgres=0x7f020011;
public static final int message_reply=0x7f020012;
public static final int msg=0x7f020013;
public static final int msg_received=0x7f020014;
public static final int msg_write=0x7f020015;
public static final int navigation_button=0x7f020016;
public static final int note=0x7f020017;
public static final int notif=0x7f020018;
public static final int notok=0x7f020019;
public static final int ok=0x7f02001a;
public static final int parent=0x7f02001b;
public static final int refresh=0x7f02001c;
public static final int rollcall=0x7f02001d;
public static final int rotate_refresh=0x7f02001e;
public static final int shopper_icon=0x7f02001f;
public static final int survey=0x7f020020;
public static final int test=0x7f020021;
public static final int timepicker_down_btn=0x7f020022;
public static final int timepicker_down_disabled=0x7f020023;
public static final int timepicker_down_disabled_focused=0x7f020024;
public static final int timepicker_down_normal=0x7f020025;
public static final int timepicker_down_pressed=0x7f020026;
public static final int timepicker_down_selected=0x7f020027;
public static final int timepicker_input=0x7f020028;
public static final int timepicker_input_disabled=0x7f020029;
public static final int timepicker_input_normal=0x7f02002a;
public static final int timepicker_input_pressed=0x7f02002b;
public static final int timepicker_input_selected=0x7f02002c;
public static final int timepicker_up_btn=0x7f02002d;
public static final int timepicker_up_disabled=0x7f02002e;
public static final int timepicker_up_disabled_focused=0x7f02002f;
public static final int timepicker_up_normal=0x7f020030;
public static final int timepicker_up_pressed=0x7f020031;
public static final int timepicker_up_selected=0x7f020032;
public static final int title_button=0x7f020033;
public static final int title_refresh=0x7f020034;
public static final int users=0x7f020035;
public static final int usr_bl=0x7f020036;
}
public static final class id {
public static final int RelativeLayout1=0x7f070028;
public static final int TextView1=0x7f07002b;
public static final int actionBarLayout=0x7f070008;
public static final int auto_focus=0x7f070002;
public static final int barcode_image_view=0x7f070015;
public static final int check=0x7f07002a;
public static final int clean_database_menu=0x7f07006c;
public static final int contentWebView=0x7f07004d;
public static final int contents_supplement_text_view=0x7f07001f;
public static final int contents_text_view=0x7f07001e;
public static final int courseNameText=0x7f07004b;
public static final int decode=0x7f070006;
public static final int decode_failed=0x7f070003;
/** Messages IDs
*/
public static final int decode_succeeded=0x7f070000;
public static final int decrement=0x7f070049;
public static final int eventContent=0x7f070041;
public static final int eventDate=0x7f07003d;
public static final int eventLocation=0x7f070043;
public static final int eventMetaData=0x7f07003b;
public static final int eventMsg=0x7f070046;
public static final int eventSender=0x7f07003f;
public static final int eventSummary=0x7f070044;
public static final int eventText=0x7f070045;
public static final int eventTime=0x7f07003e;
public static final int eventType=0x7f070042;
public static final int format_text_view=0x7f070017;
public static final int format_text_view_label=0x7f070016;
public static final int gridview=0x7f070034;
public static final int home_button=0x7f070035;
public static final int icon=0x7f070068;
public static final int icon_image=0x7f070024;
public static final int icon_text=0x7f070025;
public static final int image=0x7f070067;
public static final int imageView1=0x7f070029;
public static final int increment=0x7f070047;
public static final int launch_product_query=0x7f070005;
public static final int listIcon=0x7f070026;
public static final int listItems=0x7f07002c;
public static final int listText=0x7f070027;
public static final int messageReplyButton=0x7f070040;
public static final int message_body_text=0x7f070030;
public static final int message_button_accept=0x7f070031;
public static final int message_button_cancel=0x7f070032;
public static final int message_receivers_text=0x7f07002e;
public static final int message_subject_text=0x7f07002f;
public static final int meta_text_view=0x7f07001d;
public static final int meta_text_view_label=0x7f07001c;
public static final int moduleIcon=0x7f070009;
public static final int moduleName=0x7f07000a;
public static final int notice_body_text=0x7f070038;
public static final int notice_button_accept=0x7f070039;
public static final int notice_button_cancel=0x7f07003a;
public static final int notificationIcon=0x7f07003c;
public static final int parent_button=0x7f070036;
public static final int path=0x7f070033;
public static final int preferences_menu=0x7f07006d;
public static final int preview_view=0x7f070012;
public static final int progress_refresh=0x7f070011;
public static final int quit=0x7f070007;
public static final int rate_menu=0x7f07006b;
public static final int refresh=0x7f070010;
public static final int refresh_button=0x7f070037;
public static final int restart_preview=0x7f070001;
public static final int result_button_view=0x7f070020;
public static final int result_view=0x7f070014;
public static final int return_scan_result=0x7f070004;
public static final int senderNameText=0x7f07004a;
public static final int share_menu=0x7f07006a;
public static final int shopper_button=0x7f070021;
public static final int spinner=0x7f07002d;
public static final int status_view=0x7f070022;
public static final int summaryText=0x7f07004c;
public static final int testAnswerTypesAcceptButton=0x7f070050;
public static final int testAnswerTypesList=0x7f07004f;
public static final int testAnswerTypesText=0x7f07004e;
public static final int testEvaluateButton=0x7f07000e;
public static final int testMakeAnswer=0x7f070054;
public static final int testMakeBottomBar=0x7f070059;
public static final int testMakeCorrectAnswer=0x7f070057;
public static final int testMakeCorrectAnswerImage=0x7f070055;
public static final int testMakeEditText=0x7f070056;
public static final int testMakeList=0x7f070058;
public static final int testMakeNextButton=0x7f07005c;
public static final int testMakePrevButton=0x7f07005a;
public static final int testMakeQuestionScore=0x7f070052;
public static final int testMakeStem=0x7f070051;
public static final int testMakeText=0x7f070053;
public static final int testNumQuestionsAcceptButton=0x7f070062;
public static final int testNumQuestionsNumberPicker=0x7f07005f;
public static final int testNumQuestionsText=0x7f070061;
public static final int testResultsButton=0x7f070060;
public static final int testResultsScore=0x7f07005e;
public static final int testResultsText=0x7f07005d;
public static final int testShowResultsButton=0x7f07000c;
public static final int testTagsAcceptButton=0x7f070065;
public static final int testTagsList=0x7f070064;
public static final int testTagsText=0x7f070063;
public static final int test_questions_bar=0x7f07005b;
public static final int text=0x7f070069;
public static final int time_text_view=0x7f07001b;
public static final int time_text_view_label=0x7f07001a;
public static final int timepicker_input=0x7f070048;
public static final int title_sep_1=0x7f07000f;
public static final int title_sep_2=0x7f07000d;
public static final int title_sep_3=0x7f07000b;
public static final int toast_layout_root=0x7f070066;
public static final int type_text_view=0x7f070019;
public static final int type_text_view_label=0x7f070018;
public static final int viewfinder_view=0x7f070013;
public static final int widget44=0x7f070023;
}
public static final class layout {
public static final int action_bar=0x7f030000;
public static final int capture=0x7f030001;
public static final int grid_item=0x7f030002;
public static final int image_list_item=0x7f030003;
public static final int layout_with_action_bar=0x7f030004;
public static final int list_image_items=0x7f030005;
public static final int list_item_multiple_choice=0x7f030006;
public static final int list_item_single_choice=0x7f030007;
public static final int list_items=0x7f030008;
public static final int main=0x7f030009;
public static final int messages_dialog=0x7f03000a;
public static final int navigation=0x7f03000b;
public static final int navigation_bar=0x7f03000c;
public static final int notice_dialog=0x7f03000d;
public static final int notifications_list_item=0x7f03000e;
public static final int number_picker=0x7f03000f;
public static final int simple_list_item=0x7f030010;
public static final int single_notification_view=0x7f030011;
public static final int tests_answer_types=0x7f030012;
public static final int tests_make_questions=0x7f030013;
public static final int tests_make_results=0x7f030014;
public static final int tests_num_questions=0x7f030015;
public static final int tests_tags=0x7f030016;
public static final int toast_layout=0x7f030017;
}
public static final class menu {
public static final int menu_main=0x7f0a0000;
}
public static final class raw {
public static final int beep=0x7f050000;
public static final int klaxon=0x7f050001;
}
public static final class string {
public static final int NoNotificationsMsg=0x7f090099;
public static final int about_preferences=0x7f09001b;
public static final int acceptMsg=0x7f090043;
public static final int allMsg=0x7f090045;
public static final int app_name=0x7f090000;
public static final int assignment=0x7f090038;
public static final int attendanceModuleLabel=0x7f090080;
public static final int author_preferences=0x7f09001d;
public static final int blogTitle=0x7f090079;
public static final int blogURL=0x7f090073;
public static final int button_google_shopper=0x7f09008d;
public static final int button_ok=0x7f090090;
public static final int cancelMsg=0x7f090044;
public static final int cleanDatabaseMsg=0x7f09006b;
public static final int cleanDatabaseTitle_menu=0x7f09001a;
public static final int clickToGetCourses=0x7f09007f;
public static final int close_dialog=0x7f09000b;
public static final int connectionRequired=0x7f090087;
public static final int content=0x7f090035;
public static final int course=0x7f090088;
public static final int coursesModuleLabel=0x7f090006;
public static final int coursesProgressDescription=0x7f090023;
public static final int coursesProgressTitle=0x7f090022;
public static final int dateMsg=0x7f09003c;
public static final int documentsDownloadModuleLabel=0x7f090084;
public static final int documentsDownloadProgressDescription=0x7f090085;
public static final int errorBadLoginMsg=0x7f09005c;
public static final int errorConnectionMsg=0x7f09005e;
public static final int errorCopyMsg_DB=0x7f09002d;
public static final int errorMsgLaunchingActivity=0x7f09002a;
public static final int errorMsgNoConnection=0x7f09002c;
public static final int errorMsgWorkaroundEmulator=0x7f09002b;
public static final int errorServerResponseMsg=0x7f09005d;
public static final int errorTimeoutMsg=0x7f09005f;
public static final int evaluation=0x7f090037;
public static final int examAnnouncement=0x7f090030;
public static final int facebookTitle=0x7f090076;
public static final int facebookURL=0x7f090070;
public static final int falseMsg=0x7f090042;
public static final int firstRunMsg=0x7f090059;
public static final int footMessageMsg=0x7f09007d;
public static final int forumReply=0x7f090034;
public static final int fromMsg=0x7f09003b;
public static final int googlePlusTitle=0x7f090077;
public static final int googlePlusURL=0x7f090071;
public static final int home_icon=0x7f09009a;
public static final int initialDialogTitle=0x7f09005a;
public static final int loginModuleLabel=0x7f090004;
public static final int loginProgressDescription=0x7f090021;
public static final int loginProgressTitle=0x7f090020;
public static final int loginSuccessfulMsg=0x7f09002f;
public static final int loginTitle_menu=0x7f09001f;
public static final int mailingListTitle=0x7f090078;
public static final int mailingListURL=0x7f090072;
public static final int marketTitle=0x7f09007a;
public static final int marketURL=0x7f09006d;
public static final int marketWebURL=0x7f09006e;
public static final int marksFile=0x7f090031;
public static final int marksMsg=0x7f09007e;
public static final int message=0x7f090033;
public static final int messageSendErrorMsg=0x7f090062;
public static final int messageSendedMsg=0x7f090061;
public static final int message_body_title=0x7f090065;
public static final int message_receivers_title=0x7f090063;
public static final int message_subject_title=0x7f090064;
public static final int messages=0x7f090036;
public static final int messagesModuleLabel=0x7f090008;
public static final int msg_camera_framework_bug=0x7f09008f;
public static final int msg_default_format=0x7f090089;
public static final int msg_default_meta=0x7f09008c;
public static final int msg_default_status=0x7f09008e;
public static final int msg_default_time=0x7f09008b;
public static final int msg_default_type=0x7f09008a;
public static final int noContentMsg=0x7f09003e;
public static final int noCourseSelectedMsg=0x7f090047;
public static final int noMsg=0x7f090040;
public static final int noQuestionsAvailableTestsDownloadMsg=0x7f090048;
public static final int noQuestionsPluggableTestsDownloadMsg=0x7f090049;
public static final int noSubjectMsg=0x7f09003d;
public static final int notice=0x7f090032;
public static final int noticePublished=0x7f090068;
public static final int noticeSendError=0x7f090069;
public static final int notice_body_title=0x7f090066;
public static final int noticesModuleLabel=0x7f090009;
public static final int notificationsAlertMsg=0x7f09007c;
public static final int notificationsAlertTitle=0x7f09007b;
public static final int notificationsDownloadedMsg=0x7f090027;
public static final int notificationsEmptyListMsg=0x7f090026;
public static final int notificationsModuleLabel=0x7f090005;
public static final int notificationsProgressDescription=0x7f090025;
public static final int notificationsProgressTitle=0x7f090024;
public static final int organization_preferences=0x7f09001e;
public static final int parent_icon=0x7f09009b;
public static final int preferencesTitle_menu=0x7f090017;
public static final int publishingNotice=0x7f090067;
public static final int questionsTestsDownloadSuccesfulMsg=0x7f09004a;
public static final int rateTitle_menu=0x7f090019;
public static final int refresh_icon=0x7f09009c;
public static final int saveMsg_preferences=0x7f090014;
public static final int saveSummary_preferences=0x7f090015;
public static final int saveTitle_preferences=0x7f090016;
public static final int scan_data_not_found=0x7f090096;
public static final int scan_id=0x7f090094;
public static final int scan_name=0x7f090093;
public static final int scan_no_codes=0x7f090097;
public static final int scan_not_valid_code=0x7f090095;
public static final int scan_not_valid_student=0x7f090092;
public static final int scan_valid_student=0x7f090091;
public static final int selectCourseTitle=0x7f090046;
public static final int sendMsg=0x7f09006a;
public static final int sendingMessageMsg=0x7f090060;
public static final int serverName_preferences=0x7f090001;
public static final int serverSummary_preferences=0x7f090002;
public static final int serverTitle_preferences=0x7f090003;
public static final int set_preferences=0x7f09000c;
public static final int shareBodyMsg=0x7f09006c;
public static final int shareTitle_menu=0x7f090018;
public static final int sharedsDownloadModuleLabel=0x7f090086;
public static final int survey=0x7f090039;
public static final int testAnswerTypesMsg=0x7f090051;
public static final int testEvaluateMsg=0x7f090053;
public static final int testNoAnswerTypesSelectedMsg=0x7f090052;
public static final int testNoDetailsMsg=0x7f090057;
public static final int testNoQuestionsCourseMsg=0x7f09004b;
public static final int testNoQuestionsMeetsSpecifiedCriteriaMsg=0x7f09004d;
public static final int testNoQuestionsMsg=0x7f09004c;
public static final int testNoResultsMsg=0x7f090058;
public static final int testNoTagsSelectedMsg=0x7f090050;
public static final int testNumQuestionsMsg=0x7f09004e;
public static final int testResultsTextMsg=0x7f090054;
public static final int testShowResultsDetailsMsg=0x7f090056;
public static final int testShowResultsMsg=0x7f090055;
public static final int testTagsMsg=0x7f09004f;
public static final int testsDownloadProgressDescription=0x7f090029;
public static final int testsDownloadProgressTitle=0x7f090028;
public static final int testsModuleLabel=0x7f090007;
public static final int title_error_dialog=0x7f09000a;
public static final int trueMsg=0x7f090041;
public static final int twitterTitle=0x7f090075;
public static final int twitterURL=0x7f09006f;
public static final int twitterUser=0x7f090074;
public static final int unknownNotification=0x7f09003a;
public static final int upgradeMsg=0x7f09005b;
public static final int upgradeMsg_DB=0x7f09002e;
public static final int userIDName_preferences=0x7f09000e;
public static final int userIDSummary_preferences=0x7f09000f;
public static final int userIDTitle_preferences=0x7f090010;
public static final int userPasswordName_preferences=0x7f090011;
public static final int userPasswordSummary_preferences=0x7f090012;
public static final int userPasswordTitle_preferences=0x7f090013;
public static final int user_preferences=0x7f09000d;
public static final int users=0x7f090081;
public static final int usersDownloadProgressDescription=0x7f090082;
public static final int usersDownloadProgressTitle=0x7f090083;
public static final int usersPresent=0x7f090098;
public static final int versionTitle_preferences=0x7f09001c;
public static final int yesMsg=0x7f09003f;
}
public static final class xml {
public static final int account_preferences=0x7f040000;
public static final int authenticator=0x7f040001;
public static final int preferences=0x7f040002;
public static final int sync_notifications=0x7f040003;
public static final int syncadapter=0x7f040004;
public static final int tables=0x7f040005;
}
}

24
SWADroid/res/layout/action_bar.xml
View File

@ -126,4 +126,28 @@
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:visibility="gone"/>
<ImageView
android:id="@+id/title_sep_4"
android:layout_toLeftOf="@+id/messageReplyButton"
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:background="@color/title_separator"
android:visibility="gone"/>
<ImageButton
android:id="@+id/messageReplyButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:onClick="onReplyMessageClick"
android:background="@drawable/message_reply"
android:clickable="true"
android:visibility="gone" />
</RelativeLayout>

8
SWADroid/res/layout/notifications_list_item.xml
View File

@ -63,7 +63,13 @@
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_marginTop="3dip"
android:layout_marginRight="6dip">
android:layout_marginRight="6dip">
<TextView
android:id="@+id/eventCode"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:visibility="gone" />
<TextView
android:id="@+id/eventType"

45
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java
View File

@ -20,10 +20,14 @@ package es.ugr.swad.swadroid.modules.notifications;
import es.ugr.swad.swadroid.MenuActivity;
import es.ugr.swad.swadroid.R;
import es.ugr.swad.swadroid.modules.Messages;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebSettings.RenderPriority;
import android.webkit.WebView;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
@ -32,6 +36,12 @@ import android.widget.TextView;
* @author Juan Miguel Boyero Corral <juanmi1982@gmail.com>
*/
public class NotificationItem extends MenuActivity {
Long notificationCode;
String sender;
String course;
String summary;
String content;
private String fixLinks(String body) {
String regex = "(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]";
body = body.replaceAll(regex, "<a href=\"$0\">$0</a>");
@ -41,12 +51,9 @@ public class NotificationItem extends MenuActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
TextView text, senderTextView, courseTextView, summaryTextView;
ImageView image;
ImageView image, imageSep;
ImageButton replyButton;
WebView webview;
String sender = this.getIntent().getStringExtra("sender");
String course = this.getIntent().getStringExtra("course");
String summary = this.getIntent().getStringExtra("summary");
String content = this.getIntent().getStringExtra("content");
super.onCreate(savedInstanceState);
setContentView(R.layout.single_notification_view);
@ -60,7 +67,18 @@ public class NotificationItem extends MenuActivity {
image.setBackgroundResource(R.drawable.notif);
text = (TextView)this.findViewById(R.id.moduleName);
text.setText(R.string.notificationsModuleLabel);
text.setText(R.string.notificationsModuleLabel);
imageSep = (ImageView)this.findViewById(R.id.title_sep_4);
imageSep.setVisibility(View.VISIBLE);
replyButton = (ImageButton)this.findViewById(R.id.messageReplyButton);
replyButton.setVisibility(View.VISIBLE);
sender = this.getIntent().getStringExtra("sender");
course = this.getIntent().getStringExtra("course");
summary = this.getIntent().getStringExtra("summary");
content = this.getIntent().getStringExtra("content");
senderTextView.setText(sender);
courseTextView.setText(course);
@ -70,5 +88,18 @@ public class NotificationItem extends MenuActivity {
webview.getSettings().setRenderPriority(RenderPriority.HIGH);
webview.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
webview.loadDataWithBaseURL("", content, "text/html", "utf-8", "");
}
}
/**
* Launches an action when reply message button is pushed
* @param v Actual view
*/
public void onReplyMessageClick(View v)
{
notificationCode = Long.valueOf(this.getIntent().getStringExtra("notificationCode"));
Intent activity = new Intent(this, Messages.class);
activity.putExtra("notificationCode", notificationCode);
activity.putExtra("summary", summary);
startActivity(activity);
}
}

7
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java
View File

@ -114,8 +114,9 @@ public class Notifications extends Module {
/**
* Refreshes data on screen
*/
private void refreshScreen() {
private void refreshScreen() {
//Refresh data on screen
stopManagingCursor(dbCursor);
dbCursor = dbHelper.getDb().getCursor(Global.DB_TABLE_NOTIFICATIONS, selection, orderby);
startManagingCursor(dbCursor);
adapter.changeCursor(dbCursor);
@ -143,12 +144,14 @@ public class Notifications extends Module {
public void onItemClick(AdapterView<?> av, View v, int position, long rowId)
{
//adapter.toggleContentVisibility(position);
TextView code = (TextView) v.findViewById(R.id.eventCode);
TextView sender = (TextView) v.findViewById(R.id.eventSender);
TextView course = (TextView) v.findViewById(R.id.eventLocation);
TextView summary = (TextView) v.findViewById(R.id.eventSummary);
TextView content = (TextView) v.findViewById(R.id.eventText);
Intent activity = new Intent(getApplicationContext(), NotificationItem.class);
activity.putExtra("notificationCode", code.getText().toString());
activity.putExtra("sender", sender.getText().toString());
activity.putExtra("course", course.getText().toString());
activity.putExtra("summary", summary.getText().toString());
@ -220,7 +223,7 @@ public class Notifications extends Module {
@Override
protected void onResume() {
super.onResume();
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(NotificationsSyncAdapterService.START_SYNC);
intentFilter.addAction(NotificationsSyncAdapterService.STOP_SYNC);

2
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
View File

@ -90,6 +90,7 @@ public class NotificationsCursorAdapter extends CursorAdapter {
}
view.setScrollContainer(false);
TextView eventCode = (TextView) view.findViewById(R.id.eventCode);
TextView eventType = (TextView) view.findViewById(R.id.eventType);
TextView eventDate = (TextView) view.findViewById(R.id.eventDate);
TextView eventTime = (TextView) view.findViewById(R.id.eventTime);
@ -111,6 +112,7 @@ public class NotificationsCursorAdapter extends CursorAdapter {
};
if(eventType != null) {
eventCode.setText(notificationCode.toString());
type = cursor.getString(cursor.getColumnIndex("eventType"));
messageReplyButton.setVisibility(View.GONE);