narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

finally fixed #notificationgate

Browse source
This commit is contained in:
Daniel Gultsch 2014-03-29 20:29:03 +01:00
parent 38efb84690
commit e8290d52b1
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -85,6 +85,7 @@ public class XmppConnectionService extends Service {
private List<Conversation> conversations = null; private List<Conversation> conversations = null;
public OnConversationListChangedListener convChangedListener = null; public OnConversationListChangedListener convChangedListener = null;
private int convChangedListenerCount = 0;
private OnAccountListChangedListener accountChangedListener = null; private OnAccountListChangedListener accountChangedListener = null;
private OnTLSExceptionReceived tlsException = null; private OnTLSExceptionReceived tlsException = null;
@ -1009,10 +1010,16 @@ public class XmppConnectionService extends Service {
public void setOnConversationListChangedListener( public void setOnConversationListChangedListener(
OnConversationListChangedListener listener) { OnConversationListChangedListener listener) {
this.convChangedListener = listener; this.convChangedListener = listener;
this.convChangedListenerCount++;
Log.d(LOGTAG,"registered on conv changed in backend ("+convChangedListenerCount+")");
} }
public void removeOnConversationListChangedListener() { public void removeOnConversationListChangedListener() {
this.convChangedListener = null; this.convChangedListenerCount--;
Log.d(LOGTAG,"someone on conv changed listener removed listener ("+convChangedListenerCount+")");
if (this.convChangedListenerCount==0) {
this.convChangedListener = null;
}
} }
public void setOnAccountListChangedListener( public void setOnAccountListChangedListener(

1
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -417,7 +417,6 @@ public class ConversationActivity extends XmppActivity {
@Override @Override
void onBackendConnected() { void onBackendConnected() {
this.registerListener(); this.registerListener();
if (conversationList.size()==0) { if (conversationList.size()==0) {
updateConversationList(); updateConversationList();

7
src/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -334,14 +334,7 @@ public class ConversationFragment extends Fragment {
} }
} }
@Override
public void onResume() {
super.onResume();
activity.registerListener();
}
public void onBackendConnected() { public void onBackendConnected() {
activity.registerListener();
this.conversation = activity.getSelectedConversation(); this.conversation = activity.getSelectedConversation();
if (this.conversation == null) { if (this.conversation == null) {
return; return;