Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

some changes

This commit is contained in:
Thomas 2023-03-15 18:46:00 +01:00
parent 5fbc9d54b3
commit 1dcb500c7f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java
View File

@ -16,6 +16,8 @@ package app.fedilab.android.peertube.activities;
import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO; import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO;
import static app.fedilab.android.BaseMainActivity.currentAccount; import static app.fedilab.android.BaseMainActivity.currentAccount;
import static app.fedilab.android.BaseMainActivity.currentInstance;
import static app.fedilab.android.BaseMainActivity.currentToken;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN; import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
import static app.fedilab.android.peertube.activities.PeertubeMainActivity.typeOfConnection; import static app.fedilab.android.peertube.activities.PeertubeMainActivity.typeOfConnection;
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.ADD_COMMENT; import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.ADD_COMMENT;
@ -113,7 +115,6 @@ import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoSize; import com.google.android.exoplayer2.video.VideoSize;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.varunest.sparkbutton.SparkButton;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -590,7 +591,8 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
private void playVideo() { private void playVideo() {
if (status == null && typeOfConnection == PeertubeMainActivity.TypeOfConnection.REMOTE_ACCOUNT) { if (status == null && typeOfConnection == PeertubeMainActivity.TypeOfConnection.REMOTE_ACCOUNT) {
app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM searchVM = new ViewModelProvider(PeertubeActivity.this).get(app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM.class); app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM searchVM = new ViewModelProvider(PeertubeActivity.this).get(app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM.class);
searchVM.search(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), videoUuid, null, "statuses", false, true, false, 0, null, null, 1) String url = "https://" + HelperInstance.getLiveInstance(PeertubeActivity.this) + "/videos/watch/" + videoUuid;
searchVM.search(currentInstance, currentToken, url, null, "statuses", false, true, false, 0, null, null, 1)
.observe(PeertubeActivity.this, results -> { .observe(PeertubeActivity.this, results -> {
if (results != null && results.statuses != null && results.statuses.size() > 0) { if (results != null && results.statuses != null && results.statuses.size() > 0) {
status = results.statuses.get(0); status = results.statuses.get(0);
@ -1040,7 +1042,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
} }
alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> { alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> {
if (status.reblogged) { if (status.reblogged) {
statusesVM.unReblog(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id) statusesVM.unReblog(currentInstance, currentToken, status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1048,8 +1050,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
manageVIewPostActionsMastodon(status); manageVIewPostActionsMastodon(status);
}); });
} else { } else {
((SparkButton) v).playAnimation(); statusesVM.reblog(currentInstance, currentToken, status.id, null)
statusesVM.reblog(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id, null)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1064,7 +1065,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
alert.show(); alert.show();
} else { } else {
if (status.reblogged) { if (status.reblogged) {
statusesVM.unReblog(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id) statusesVM.unReblog(currentInstance, currentToken, status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1072,8 +1073,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
manageVIewPostActionsMastodon(status); manageVIewPostActionsMastodon(status);
}); });
} else { } else {
((SparkButton) v).playAnimation(); statusesVM.reblog(currentInstance, currentToken, status.id, null)
statusesVM.reblog(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id, null)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1098,7 +1098,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
} }
alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> { alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> {
if (status.favourited) { if (status.favourited) {
statusesVM.unFavourite(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id) statusesVM.unFavourite(currentInstance, currentToken, status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1106,8 +1106,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
manageVIewPostActionsMastodon(status); manageVIewPostActionsMastodon(status);
}); });
} else { } else {
((SparkButton) v).playAnimation(); statusesVM.favourite(currentInstance, currentToken, status.id)
statusesVM.favourite(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1122,7 +1121,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
alert.show(); alert.show();
} else { } else {
if (status.favourited) { if (status.favourited) {
statusesVM.unFavourite(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id) statusesVM.unFavourite(currentInstance, currentToken, status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1130,8 +1129,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
manageVIewPostActionsMastodon(status); manageVIewPostActionsMastodon(status);
}); });
} else { } else {
((SparkButton) v).playAnimation(); statusesVM.favourite(currentInstance, currentToken, status.id)
statusesVM.favourite(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1147,7 +1145,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
if (status != null) { if (status != null) {
StatusesVM statusesVM = new ViewModelProvider(PeertubeActivity.this).get(StatusesVM.class); StatusesVM statusesVM = new ViewModelProvider(PeertubeActivity.this).get(StatusesVM.class);
if (status.bookmarked) { if (status.bookmarked) {
statusesVM.unBookmark(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id) statusesVM.unBookmark(currentInstance, currentToken, status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1155,8 +1153,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
manageVIewPostActionsMastodon(status); manageVIewPostActionsMastodon(status);
}); });
} else { } else {
((SparkButton) v).playAnimation(); statusesVM.bookmark(currentInstance, currentToken, status.id)
statusesVM.bookmark(HelperInstance.getLiveInstance(PeertubeActivity.this), HelperInstance.getToken(), status.id)
.observe(PeertubeActivity.this, _status -> { .observe(PeertubeActivity.this, _status -> {
if (_status != null) { if (_status != null) {
status = _status; status = _status;
@ -1989,6 +1986,9 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
if (Helper.isLoggedIn()) { if (Helper.isLoggedIn()) {
PostActionsVM viewModelComment = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class); PostActionsVM viewModelComment = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
viewModelComment.comment(ADD_COMMENT, peertube.getId(), null, commentStr).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(ADD_COMMENT, 0, apiResponse1)); viewModelComment.comment(ADD_COMMENT, peertube.getId(), null, commentStr).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(ADD_COMMENT, 0, apiResponse1));
} else {//Remote account is posting a message
StatusesVM statusesVM = new ViewModelProvider(PeertubeActivity.this).get(StatusesVM.class);
statusesVM.postStatus(currentInstance, currentToken, null, commentStr, null, null, null, null, null, status.id, false, null, "public", null, null, null).observe(PeertubeActivity.this, this::manageVIewPostActionsMastodon);
} }
binding.addCommentWrite.setText(""); binding.addCommentWrite.setText("");
} }
@ -1998,6 +1998,9 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
if (Helper.isLoggedIn()) { if (Helper.isLoggedIn()) {
PostActionsVM viewModelComment = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class); PostActionsVM viewModelComment = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
viewModelComment.comment(REPLY, peertube.getId(), comment.getId(), commentView).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(REPLY, position, apiResponse1)); viewModelComment.comment(REPLY, peertube.getId(), comment.getId(), commentView).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(REPLY, position, apiResponse1));
} else {//Remote account is posting a message
StatusesVM statusesVM = new ViewModelProvider(PeertubeActivity.this).get(StatusesVM.class);
statusesVM.postStatus(currentInstance, currentToken, null, commentView, null, null, null, null, null, status.id, false, null, "public", null, null, null).observe(PeertubeActivity.this, this::manageVIewPostActionsMastodon);
} }
binding.addCommentWrite.setText(""); binding.addCommentWrite.setText("");
} }