sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds

This commit is contained in:
iNPUTmice 2014-11-11 00:16:43 +01:00
parent c8a6b05163
commit fce78abb1c
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -401,10 +401,10 @@ public class XmppConnectionService extends Service {
} }
} }
} }
PowerManager pm = (PowerManager) this.getSystemService(Context.POWER_SERVICE); /*PowerManager pm = (PowerManager) this.getSystemService(Context.POWER_SERVICE);
if (!pm.isScreenOn()) { if (!pm.isScreenOn()) {
removeStaleListeners(); removeStaleListeners();
} }*/
if (wakeLock.isHeld()) { if (wakeLock.isHeld()) {
try { try {
wakeLock.release(); wakeLock.release();
@ -1080,11 +1080,11 @@ public class XmppConnectionService extends Service {
public void setOnConversationListChangedListener( public void setOnConversationListChangedListener(
OnConversationUpdate listener) { OnConversationUpdate listener) {
if (!isScreenOn()) { /*if (!isScreenOn()) {
Log.d(Config.LOGTAG, Log.d(Config.LOGTAG,
"ignoring setOnConversationListChangedListener"); "ignoring setOnConversationListChangedListener");
return; return;
} }*/
synchronized (this.convChangedListenerCount) { synchronized (this.convChangedListenerCount) {
if (checkListeners()) { if (checkListeners()) {
switchToForeground(); switchToForeground();
@ -1110,10 +1110,10 @@ public class XmppConnectionService extends Service {
} }
public void setOnAccountListChangedListener(OnAccountUpdate listener) { public void setOnAccountListChangedListener(OnAccountUpdate listener) {
if (!isScreenOn()) { /*if (!isScreenOn()) {
Log.d(Config.LOGTAG, "ignoring setOnAccountListChangedListener"); Log.d(Config.LOGTAG, "ignoring setOnAccountListChangedListener");
return; return;
} }*/
synchronized (this.accountChangedListenerCount) { synchronized (this.accountChangedListenerCount) {
if (checkListeners()) { if (checkListeners()) {
switchToForeground(); switchToForeground();
@ -1137,10 +1137,10 @@ public class XmppConnectionService extends Service {
} }
public void setOnRosterUpdateListener(OnRosterUpdate listener) { public void setOnRosterUpdateListener(OnRosterUpdate listener) {
if (!isScreenOn()) { /*if (!isScreenOn()) {
Log.d(Config.LOGTAG, "ignoring setOnRosterUpdateListener"); Log.d(Config.LOGTAG, "ignoring setOnRosterUpdateListener");
return; return;
} }*/
synchronized (this.rosterChangedListenerCount) { synchronized (this.rosterChangedListenerCount) {
if (checkListeners()) { if (checkListeners()) {
switchToForeground(); switchToForeground();

9
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -896,12 +896,11 @@ public class ConversationActivity extends XmppActivity implements
public void run() { public void run() {
updateConversationList(); updateConversationList();
if (conversationList.size() == 0) { if (conversationList.size() == 0) {
startActivity(new Intent(getApplicationContext(), startActivity(new Intent(getApplicationContext(),
StartConversationActivity.class)); StartConversationActivity.class));
finish(); finish();
} else {
ConversationActivity.this.mConversationFragment.updateMessages();
} }
ConversationActivity.this.mConversationFragment.updateMessages();
} }
}); });
} }

6
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View File

@ -105,7 +105,11 @@ public abstract class XmppActivity extends Activity {
XmppConnectionBinder binder = (XmppConnectionBinder) service; XmppConnectionBinder binder = (XmppConnectionBinder) service;
xmppConnectionService = binder.getService(); xmppConnectionService = binder.getService();
xmppConnectionServiceBound = true; xmppConnectionServiceBound = true;
onBackendConnected(); if (!isFinishing() && !isDestroyed()) {
onBackendConnected();
} else {
Log.d(Config.LOGTAG,"omitting call to onBackendConnected()");
}
} }
@Override @Override