Commit 538b41d8 authored by Lucio Maciel's avatar Lucio Maciel

Fix crashes

parent c104d3b8
......@@ -11,7 +11,6 @@ import androidx.core.view.ViewCompat
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import chat.rocket.android.R
import chat.rocket.android.R.string.message_credentials_saved_successfully
import chat.rocket.android.analytics.AnalyticsManager
import chat.rocket.android.analytics.event.ScreenViewEvent
import chat.rocket.android.authentication.signup.presentation.SignupPresenter
......@@ -64,7 +63,7 @@ class SignupFragment : Fragment(), SignupView {
if (resultCode == Activity.RESULT_OK) {
if (data != null) {
if (requestCode == SAVE_CREDENTIALS) {
showMessage(getString(message_credentials_saved_successfully))
showMessage(getString(R.string.message_credentials_saved_successfully))
}
}
}
......
......@@ -25,25 +25,25 @@ abstract class MessageDao {
@Insert
abstract fun insert(message: MessageEntity)
@Insert
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(relation: MessageFavoritesRelation)
@Insert
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(relation: MessageMentionsRelation)
@Insert
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(relation: MessageChannels)
@Insert
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(attachment: AttachmentEntity)
@Insert
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(field: AttachmentFieldEntity)
@Insert(onConflict = OnConflictStrategy.IGNORE)
abstract fun insert(reaction: ReactionEntity)
@Insert
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(url: UrlEntity)
@Query("DELETE FROM messages WHERE id = :id")
......
......@@ -8,18 +8,18 @@ import android.view.ViewGroup
import android.webkit.WebView
import android.webkit.WebViewClient
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import chat.rocket.android.R
import chat.rocket.android.analytics.AnalyticsManager
import chat.rocket.android.util.extensions.inflate
import chat.rocket.android.util.extensions.ui
import dagger.android.support.DaggerFragment
import kotlinx.android.synthetic.main.fragment_admin_panel_web_view.*
import javax.inject.Inject
private const val BUNDLE_WEB_PAGE_URL = "web_page_url"
private const val BUNDLE_USER_TOKEN = "user_token"
class AdminPanelWebViewFragment : Fragment() {
class AdminPanelWebViewFragment : DaggerFragment() {
private lateinit var webPageUrl: String
private lateinit var userToken: String
@Inject
......
......@@ -9,12 +9,14 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/accounts_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"
tools:visibility="visible">
......
......@@ -21,6 +21,7 @@
android:layout_marginStart="56dp"
android:layout_marginTop="2dp"
android:textDirection="locale"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
......
......@@ -26,7 +26,7 @@ ext {
playServices : '16.0.0',
exoPlayer : '2.8.2',
flexbox : '1.0.0',
material : '1.0.0',
material : '1.0.0-beta01',
room : '2.0.0',
lifecycle : '2.0.0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment