Merge lp:~openerp-dev/openerp-mobile/trunk-bug-1252747-dpr into lp:openerp-mobile

Proposed by Dharmang Soni (OpenERP)
Status: Merged
Merged at revision: 93
Proposed branch: lp:~openerp-dev/openerp-mobile/trunk-bug-1252747-dpr
Merge into: lp:openerp-mobile
Diff against target: 52 lines (+6/-4)
2 files modified
src/com/openerp/addons/messages/Message.java (+3/-1)
src/com/openerp/addons/note/Note.java (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openerp-mobile/trunk-bug-1252747-dpr
Reviewer Review Type Date Requested Status
OpenERP R&D Team Pending
Review via email: mp+195904@code.launchpad.net

Description of the change

Hello,

Hangs on first time sync with message module and note module resolved.

Thanks,
Dharmang Soni (dpr)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/openerp/addons/messages/Message.java'
2--- src/com/openerp/addons/messages/Message.java 2013-11-13 09:26:29 +0000
3+++ src/com/openerp/addons/messages/Message.java 2013-11-20 05:21:29 +0000
4@@ -97,6 +97,7 @@
5 "#EBB035" };
6 HashMap<String, Integer> message_model_colors = new HashMap<String, Integer>();
7 int tag_color_count = 0;
8+ boolean isSynced = false;
9
10 public enum TYPE {
11 INBOX, TODO, TOME, ARCHIVE, GROUP
12@@ -588,7 +589,8 @@
13 }
14
15 } else {
16- if (db.isEmptyTable(db)) {
17+ if (db.isEmptyTable(db) && !isSynced) {
18+ isSynced = true;
19 scope.context().runOnUiThread(new Runnable() {
20 @Override
21 public void run() {
22
23=== modified file 'src/com/openerp/addons/note/Note.java'
24--- src/com/openerp/addons/note/Note.java 2013-11-18 08:45:16 +0000
25+++ src/com/openerp/addons/note/Note.java 2013-11-20 05:21:29 +0000
26@@ -88,6 +88,7 @@
27 JSONObject res = null;
28 String[] note_tags = null;
29 String tags = "";
30+ boolean isSynced = false;
31
32 public View onCreateView(LayoutInflater inflater, ViewGroup container,
33 Bundle savedInstanceState) {
34@@ -262,7 +263,6 @@
35
36 @Override
37 public void onRefreshStarted(View view) {
38- // TODO Auto-generated method stub
39 scope.context().requestSync(NoteProvider.AUTHORITY);
40 }
41
42@@ -551,8 +551,8 @@
43 lists.add(row);
44 }
45 } else {
46- if (db.isEmptyTable(db)) {
47-
48+ if (db.isEmptyTable(db) && !isSynced) {
49+ isSynced = true;
50 // Hiding text message of empty list view
51 // due to visibility of sync process message
52 emptyNotesText.setVisibility(View.GONE);