Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 142b6c4

Browse files
committed
Update app version
1 parent 3e7ee4e commit 142b6c4

File tree

5 files changed

+16
-23
lines changed

5 files changed

+16
-23
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
applicationId "chat.rocket.android"
1919
minSdkVersion versions.minSdk
2020
targetSdkVersion versions.targetSdk
21-
versionCode 2061
21+
versionCode 2064
2222
versionName "3.3.1"
2323
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2424
multiDexEnabled true

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,12 @@ private const val BUNDLE_IS_FAVORITE = "BUNDLE_IS_FAVORITE"
6060
private const val BUNDLE_DISABLE_MENU = "BUNDLE_DISABLE_MENU"
6161

6262
class ChatDetailsFragment : Fragment(), ChatDetailsView {
63-
@Inject
64-
lateinit var presenter: ChatDetailsPresenter
65-
@Inject
66-
lateinit var factory: ChatDetailsViewModelFactory
67-
@Inject
68-
lateinit var serverUrl: CurrentServerRepository
69-
@Inject
70-
lateinit var settings: GetSettingsInteractor
63+
@Inject lateinit var presenter: ChatDetailsPresenter
64+
@Inject lateinit var factory: ChatDetailsViewModelFactory
65+
@Inject lateinit var serverUrl: CurrentServerRepository
66+
@Inject lateinit var settings: GetSettingsInteractor
7167
private var adapter: ChatDetailsAdapter? = null
7268
private lateinit var viewModel: ChatDetailsViewModel
73-
7469
internal lateinit var chatRoomId: String
7570
internal lateinit var chatRoomType: String
7671
private var isSubscribed: Boolean = true
@@ -154,33 +149,33 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
154149
adapter?.let {
155150
if (!disableMenu) {
156151
it.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
157-
presenter.toFiles(chatRoomId!!)
152+
presenter.toFiles(chatRoomId)
158153
}
159154
}
160155

161156
if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
162157
it.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
163-
presenter.toMentions(chatRoomId!!)
158+
presenter.toMentions(chatRoomId)
164159
}
165160
it.addOption(
166161
getString(R.string.title_members),
167162
R.drawable.ic_people_outline_black_24dp
168163
) {
169-
presenter.toMembers(chatRoomId!!)
164+
presenter.toMembers(chatRoomId)
170165
}
171166
}
172167

173168
it.addOption(
174169
getString(R.string.title_favorite_messages),
175170
R.drawable.ic_star_border_white_24dp
176171
) {
177-
presenter.toFavorites(chatRoomId!!)
172+
presenter.toFavorites(chatRoomId)
178173
}
179174
it.addOption(
180175
getString(R.string.title_pinned_messages),
181176
R.drawable.ic_action_message_pin_24dp
182177
) {
183-
presenter.toPinned(chatRoomId!!)
178+
presenter.toPinned(chatRoomId)
184179
}
185180
}
186181
}
@@ -206,11 +201,11 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
206201

207202
private fun getDetails() {
208203
if (isSubscribed)
209-
viewModel.getDetails(chatRoomId!!).observe(viewLifecycleOwner, Observer { details ->
204+
viewModel.getDetails(chatRoomId).observe(viewLifecycleOwner, Observer { details ->
210205
displayDetails(details)
211206
})
212207
else
213-
presenter.getDetails(chatRoomId!!, chatRoomType!!)
208+
presenter.getDetails(chatRoomId, chatRoomType)
214209
}
215210

216211
private fun setupOptions() {

app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ internal const val TAG_MESSAGE_INFO_FRAGMENT = "MessageInfoFragment"
3434
private const val BUNDLE_MESSAGE_ID = "message_id"
3535

3636
class MessageInfoFragment : Fragment(), MessageInfoView {
37-
@Inject
38-
lateinit var presenter: MessageInfoPresenter
39-
@Inject
40-
lateinit var analyticsManager: AnalyticsManager
37+
@Inject lateinit var presenter: MessageInfoPresenter
38+
@Inject lateinit var analyticsManager: AnalyticsManager
4139
private lateinit var adapter: ReadReceiptAdapter
4240
private lateinit var messageId: String
4341

app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ class UiModelMapper @Inject constructor(
401401

402402
private fun attachmentUrl(url: String?): String? {
403403
if (url.isNullOrEmpty()) return null
404-
if (url!!.startsWith("http")) return url
404+
if (url.startsWith("http")) return url
405405

406406
val fullUrl = "$baseUrl$url"
407407
val httpUrl = HttpUrl.parse(fullUrl)

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ fun PublicSettings.messageReadReceiptStoreUsers(): Boolean = this[MESSAGE_READ_R
116116
fun PublicSettings.uploadMimeTypeFilter(): Array<String>? {
117117
val values = this[UPLOAD_WHITELIST_MIMETYPES]?.value as String?
118118
if (!values.isNullOrBlank()) {
119-
return values!!.split(",").mapToTypedArray { it.trim() }
119+
return values.split(",").mapToTypedArray { it.trim() }
120120
}
121121
return null
122122
}

0 commit comments

Comments
 (0)