ChronosXYZ/Influence
1
0
Fork 0
mirror of https://github.com/ChronosX88/Influence.git synced 2024-11-23 10:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Fixed user presence system (now user availability/unavailability depends on the life cycle of the MainActivity

Browse Source
This commit is contained in:
ChronosX88 2019-05-25 09:02:59 +04:00
parent 8b9c07de89
commit 0c99ac4db1
5 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/io/github/chronosx88/influence/XMPPConnection.java
View File

@ -125,7 +125,6 @@ public class XMPPConnection implements ConnectionListener {
if(mamManager.isSupported()) {
MamManager.getInstanceFor(connection).enableMamForAllMessages();
}
connection.sendStanza(new Presence(Presence.Type.available));
} catch (InterruptedException e) {
e.printStackTrace();
}
@ -224,4 +223,18 @@ public class XMPPConnection implements ConnectionListener {
public Presence getUserPresence(BareJid jid) {
return roster.getPresence(jid);
}
public void sendUserPresence(Presence presence) {
if(connection != null) {
if(isConnectionAlive()) {
try {
connection.sendStanza(presence);
} catch (SmackException.NotConnectedException e) {
e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}
}

7
app/src/main/java/io/github/chronosx88/influence/XMPPConnectionService.java
View File

@ -75,13 +75,6 @@ public class XMPPConnectionService extends Service {
if(connection != null) {
thread.interrupt();
thread = null;
try {
connection.getConnection().sendStanza(new Presence(Presence.Type.unavailable));
} catch (SmackException.NotConnectedException e) {
e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
}
connection.disconnect();
connection = null;
}

1
app/src/main/java/io/github/chronosx88/influence/contracts/CoreContracts.kt
View File

@ -66,6 +66,7 @@ interface CoreContracts {
fun logoutFromAccount()
fun onStart()
fun onStop()
fun onDestroy()
}
interface IMainViewContract {

20
app/src/main/java/io/github/chronosx88/influence/presenters/MainPresenter.kt
View File

@ -25,9 +25,13 @@ import io.github.chronosx88.influence.logic.MainLogic
import io.github.chronosx88.influence.models.appEvents.AuthenticationStatusEvent
import io.github.chronosx88.influence.models.appEvents.NewChatEvent
import io.github.chronosx88.influence.views.LoginActivity
import java9.util.concurrent.CompletableFuture
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import org.jivesoftware.smack.packet.Presence
class MainPresenter(private val view: CoreContracts.IMainViewContract) : CoreContracts.IMainPresenterContract {
private val logic: CoreContracts.IMainLogicContract = MainLogic()
@ -54,6 +58,13 @@ class MainPresenter(private val view: CoreContracts.IMainViewContract) : CoreCon
AppHelper.getContext().startActivity(intent)
view.finishActivity()
}
AuthenticationStatusEvent.CONNECT_AND_LOGIN_SUCCESSFUL -> {
GlobalScope.launch {
if(AppHelper.getXmppConnection().isConnectionAlive)
AppHelper.getXmppConnection().sendUserPresence(Presence(Presence.Type.available))
}
}
}
}
@ -68,4 +79,13 @@ class MainPresenter(private val view: CoreContracts.IMainViewContract) : CoreCon
override fun onStop() {
EventBus.getDefault().unregister(this)
}
override fun onDestroy() {
GlobalScope.launch {
if(AppHelper.getXmppConnection() != null) {
if(AppHelper.getXmppConnection().isConnectionAlive)
AppHelper.getXmppConnection().sendUserPresence(Presence(Presence.Type.unavailable))
}
}
}
}

6
app/src/main/java/io/github/chronosx88/influence/views/MainActivity.java
View File

@ -164,4 +164,10 @@ public class MainActivity extends AppCompatActivity implements CoreContracts.IMa
public void finishActivity() {
finish();
}
@Override
protected void onDestroy() {
super.onDestroy();
presenter.onDestroy();
}
}