Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Presentation hotfixes

This commit is contained in:
Paul Schaub 2021-04-26 15:23:15 +02:00
parent 9687f94878
commit a1f224d800
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
5 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsFragment.java
View File

@ -137,9 +137,14 @@ public class AccountDetailsFragment extends Fragment {
.replace(R.id.fragment, IkeySetupFragment.newInstance(accountId))
.commit();
return true;
case R.id.action_publish_ikey_element:
sendIkeyElement();
return true;
case R.id.action_send_presence:
sendPresence();
return true;
}
return super.onOptionsItemSelected(item);
}
@ -152,6 +157,10 @@ public class AccountDetailsFragment extends Fragment {
viewModel.sendIkeyElement(accountId);
}
private void sendPresence() {
viewModel.sendPresence(accountId);
}
private void observeViewModel() {
viewModel.getIkeyFingerprint().observe(getViewLifecycleOwner(), this::displayIkeyFingerprintAndDecisionButton);
viewModel.getLocalFingerprint().observe(getViewLifecycleOwner(), this::displayLocalOxFingerprint);

9
app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AndroidAccountDetailsViewModel.java
View File

@ -157,6 +157,15 @@ public class AndroidAccountDetailsViewModel extends AndroidViewModel implements
return accountAuthenticated;
}
public void sendPresence(UUID accountId) {
addDisposable(
getCommonViewModel().sendPresence(accountId)
.subscribeOn(schedulers.getNewThread())
.observeOn(schedulers.getUiScheduler())
.subscribe(() -> LOGGER.log(Level.INFO, "Presence update sent for account " + accountId),
e -> LOGGER.log(Level.SEVERE, "Error sending presence update for account " + accountId, e)));
}
public static class AndroidAccountDetailsViewModelFactory implements ViewModelProvider.Factory {
private final Application application;

4
app/src/main/res/menu/menu_account_details.xml
View File

@ -31,4 +31,8 @@
android:id="@+id/action_publish_ikey_element"
android:title="Publish Ikey Element" />
<item
android:id="@+id/action_send_presence"
android:title="Send Presence" />
</menu>

10
domain/src/main/java/org/mercury_im/messenger/core/viewmodel/account/detail/AccountDetailsViewModel.java
View File

@ -2,6 +2,8 @@ package org.mercury_im.messenger.core.viewmodel.account.detail;
import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.PresenceBuilder;
import org.jivesoftware.smackx.ikey.IkeyManager;
import org.jivesoftware.smackx.ikey.element.IkeyElement;
import org.jivesoftware.smackx.ikey.element.SubordinateElement;
@ -254,4 +256,12 @@ public class AccountDetailsViewModel implements MercuryViewModel {
.map(ConnectionState::getConnectivity)
.map(connectivity -> connectivity == ConnectivityState.authenticated);
}
public Completable sendPresence(UUID accountId) {
return Completable.fromAction(() -> {
XMPPConnection connection = connectionManager.getConnection(accountId).getConnection();
connection.sendStanza(PresenceBuilder.buildPresence().ofType(Presence.Type.available).build());
});
}
}

2
libs/Smack

@ -1 +1 @@
Subproject commit d35354b1b05d80a6ab45fed9548304707eaab460
Subproject commit 4849c6c544962b198ca761b8c697fd3f96292994