diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 796c4f31..0ecf87ab 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -306,7 +306,6 @@ - showNotification(getNotification(reactionType), (int) commentId)) - .subscribe(response -> hideNotification((int) commentId), throwable -> hideNotification((int) commentId)); - } - - private void postCommit(@NonNull ReactionTypes reactionType, @NonNull String login, @NonNull String repo, long commentId, boolean isEnterprise) { - RxHelper.safeObservable(RestProvider.getReactionsService(isEnterprise) - .postCommitReaction(new PostReactionModel(reactionType.getContent()), login, repo, commentId)) - .doOnSubscribe(disposable -> showNotification(getNotification(reactionType), (int) commentId)) - .subscribe(response -> hideNotification((int) commentId), throwable -> hideNotification((int) commentId)); - } - - public NotificationCompat.Builder getNotification(@NonNull ReactionTypes reactionTypes) { - if (notification == null) { - notification = new NotificationCompat.Builder(this, "reaction") - .setSmallIcon(R.drawable.ic_sync) - .setProgress(0, 100, true); - } - notification.setContentTitle(getString(R.string.posting_reaction, reactionTypes.getContent())); - return notification; - } - - public NotificationManager getNotificationManager() { - if (notificationManager == null) { - notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - } - return notificationManager; - } - - private void showNotification(@NonNull NotificationCompat.Builder builder, int id) { - getNotificationManager().notify(id, builder.build()); - } - - private void hideNotification(int id) { - getNotificationManager().cancel(id); - } -} diff --git a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java index 727f3f49..9b9dba3f 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java @@ -1,28 +1,21 @@ package com.fastaccess.provider.timeline; -import android.content.Context; - -import androidx.annotation.IdRes; -import androidx.annotation.NonNull; - import android.view.View; import android.widget.TextView; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; -import com.fastaccess.R; import com.fastaccess.data.dao.ReactionsModel; import com.fastaccess.data.dao.TimelineModel; import com.fastaccess.data.dao.model.Comment; import com.fastaccess.data.dao.types.ReactionTypes; -import com.fastaccess.provider.tasks.git.ReactionService; import com.fastaccess.ui.widgets.SpannableBuilder; -import org.w3c.dom.Text; - import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; + /** * Created by Kosh on 30 Mar 2017, 6:44 PM */ diff --git a/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java b/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java index e185c5cc..7de56895 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java @@ -50,19 +50,19 @@ public class ReactionsProvider { switch (reactionType) { case COMMENT: observable = RestProvider.getReactionsService(isEnterprise) - .postIssueCommentReaction(new PostReactionModel(reactionTypes.getContent()), login, repoId, idOrNumber); + .postIssueCommentReaction(new PostReactionModel(reactionTypes.getPostContent()), login, repoId, idOrNumber); break; case HEADER: observable = RestProvider.getReactionsService(isEnterprise) - .postIssueReaction(new PostReactionModel(reactionTypes.getContent()), login, repoId, idOrNumber); + .postIssueReaction(new PostReactionModel(reactionTypes.getPostContent()), login, repoId, idOrNumber); break; case REVIEW_COMMENT: observable = RestProvider.getReactionsService(isEnterprise) - .postCommentReviewReaction(new PostReactionModel(reactionTypes.getContent()), login, repoId, idOrNumber); + .postCommentReviewReaction(new PostReactionModel(reactionTypes.getPostContent()), login, repoId, idOrNumber); break; case COMMIT: observable = RestProvider.getReactionsService(isEnterprise) - .postCommitReaction(new PostReactionModel(reactionTypes.getContent()), login, repoId, idOrNumber); + .postCommitReaction(new PostReactionModel(reactionTypes.getPostContent()), login, repoId, idOrNumber); break; } if (observable == null) return null;