diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt index 1f381c65c..177882d44 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt @@ -26,7 +26,6 @@ import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable import android.os.Build import android.text.TextUtils -import android.util.Log import android.view.View import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat @@ -41,16 +40,11 @@ import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.databinding.ItemCustomIncomingPollMessageBinding import com.nextcloud.talk.models.json.chat.ChatMessage -import com.nextcloud.talk.polls.repositories.model.PollOverall import com.nextcloud.talk.polls.ui.PollMainDialogFragment import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.preferences.AppPreferences import com.stfalcon.chatkit.messages.MessageHolders -import io.reactivex.Observer -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.disposables.Disposable -import io.reactivex.schedulers.Schedulers import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) @@ -134,40 +128,6 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : MessageH TAG ) } - - val credentials = ApiUtils.getCredentials(message.activeUser?.username, message.activeUser?.token) - ncApi.getPoll( - credentials, - ApiUtils.getUrlForPoll( - message.activeUser?.baseUrl, - roomToken, - pollId - ) - ).subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Observer { - override fun onSubscribe(d: Disposable) { - // unused atm - } - - override fun onNext(pollOverall: PollOverall) { - if (pollOverall.ocs!!.data!!.status == 0) { - binding.messagePollSubtitle.text = - context.resources?.getString(R.string.message_poll_tap_to_vote) - } else { - binding.messagePollSubtitle.text = - context.resources?.getString(R.string.message_poll_tap_see_results) - } - } - - override fun onError(e: Throwable) { - Log.e(TAG, "Error while fetching poll", e) - } - - override fun onComplete() { - // unused atm - } - }) } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt index d6c86a239..8f865cccc 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt @@ -24,7 +24,6 @@ package com.nextcloud.talk.adapters.messages import android.annotation.SuppressLint import android.content.Context import android.graphics.PorterDuff -import android.util.Log import android.view.View import androidx.appcompat.content.res.AppCompatResources import androidx.core.view.ViewCompat @@ -38,16 +37,11 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.databinding.ItemCustomOutcomingPollMessageBinding import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.chat.ReadStatus -import com.nextcloud.talk.polls.repositories.model.PollOverall import com.nextcloud.talk.polls.ui.PollMainDialogFragment import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.preferences.AppPreferences import com.stfalcon.chatkit.messages.MessageHolders -import io.reactivex.Observer -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.disposables.Disposable -import io.reactivex.schedulers.Schedulers import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) @@ -150,40 +144,6 @@ class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : Messag TAG ) } - - val credentials = ApiUtils.getCredentials(message.activeUser?.username, message.activeUser?.token) - ncApi.getPoll( - credentials, - ApiUtils.getUrlForPoll( - message.activeUser?.baseUrl, - roomToken, - pollId - ) - ).subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Observer { - override fun onSubscribe(d: Disposable) { - // unused atm - } - - override fun onNext(pollOverall: PollOverall) { - if (pollOverall.ocs!!.data!!.status == 0) { - binding.messagePollSubtitle.text = - context?.resources?.getString(R.string.message_poll_tap_to_vote) - } else { - binding.messagePollSubtitle.text = - context?.resources?.getString(R.string.message_poll_tap_see_results) - } - } - - override fun onError(e: Throwable) { - Log.e(TAG, "Error while fetching poll", e) - } - - override fun onComplete() { - // unused atm - } - }) } } diff --git a/app/src/main/res/layout/item_custom_incoming_poll_message.xml b/app/src/main/res/layout/item_custom_incoming_poll_message.xml index e069bf7c7..6c8520a51 100644 --- a/app/src/main/res/layout/item_custom_incoming_poll_message.xml +++ b/app/src/main/res/layout/item_custom_incoming_poll_message.xml @@ -91,7 +91,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/double_margin_between_elements" - android:text="@string/message_poll_tap_to_vote" /> + android:text="@string/message_poll_tap_to_open" /> No search results - Tap to vote - Tap to see results + Tap to open poll %1$s votes Add option Edit vote