gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve detekt score

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-01 14:57:25 +02:00
parent e4da772882
commit b513d0f154
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
6 changed files with 170 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -292,7 +292,7 @@ class ChatController(args: Bundle) :
lobbyTimerHandler = Handler() lobbyTimerHandler = Handler()
} }
lobbyTimerHandler?.postDelayed({ getRoomInfo() }, 5000) lobbyTimerHandler?.postDelayed({ getRoomInfo() }, LOBBY_TIMER_DELAY)
} }
} }
}) })
@ -460,7 +460,12 @@ class ChatController(args: Bundle) :
} else { } else {
scrollPosition = newMessagesCount - 1 scrollPosition = newMessagesCount - 1
} }
Handler().postDelayed({ binding.messagesListView.smoothScrollToPosition(scrollPosition) }, 200) Handler().postDelayed(
{
binding.messagesListView.smoothScrollToPosition(scrollPosition)
},
NEW_MESSAGES_POPUP_BUBBLE_DELAY
)
} }
} }
@ -492,7 +497,7 @@ class ChatController(args: Bundle) :
}) })
val filters = arrayOfNulls<InputFilter>(1) val filters = arrayOfNulls<InputFilter>(1)
val lengthFilter = CapabilitiesUtil.getMessageMaxLength(conversationUser) ?: 1000 val lengthFilter = CapabilitiesUtil.getMessageMaxLength(conversationUser) ?: MESSAGE_MAX_LENGTH
filters[0] = InputFilter.LengthFilter(lengthFilter) filters[0] = InputFilter.LengthFilter(lengthFilter)
binding.messageInputView.inputEditText?.filters = filters binding.messageInputView.inputEditText?.filters = filters
@ -1330,7 +1335,7 @@ class ChatController(args: Bundle) :
} }
} }
if (response.code() == 200) { if (response.code() == HTTP_CODE_OK) {
val chatOverall = response.body() as ChatOverall? val chatOverall = response.body() as ChatOverall?
val chatMessageList = setDeletionFlagsAndRemoveInfomessages(chatOverall?.ocs!!.data) val chatMessageList = setDeletionFlagsAndRemoveInfomessages(chatOverall?.ocs!!.data)
@ -1836,10 +1841,9 @@ class ChatController(args: Bundle) :
if (message.hasFileAttachment()) return false if (message.hasFileAttachment()) return false
val sixHoursInMillis = 6 * 3600 * 1000
val isOlderThanSixHours = message val isOlderThanSixHours = message
.createdAt .createdAt
?.before(Date(System.currentTimeMillis() - sixHoursInMillis)) == true ?.before(Date(System.currentTimeMillis() - AGE_THREHOLD_FOR_DELETE_MESSAGE)) == true
if (isOlderThanSixHours) return false if (isOlderThanSixHours) return false
val isUserAllowedByPrivileges = if (message.actorId == conversationUser.userId) { val isUserAllowedByPrivileges = if (message.actorId == conversationUser.userId) {
@ -1855,12 +1859,11 @@ class ChatController(args: Bundle) :
} }
override fun hasContentFor(message: IMessage, type: Byte): Boolean { override fun hasContentFor(message: IMessage, type: Byte): Boolean {
when (type) { return when (type) {
CONTENT_TYPE_SYSTEM_MESSAGE -> return !TextUtils.isEmpty(message.systemMessage) CONTENT_TYPE_SYSTEM_MESSAGE -> !TextUtils.isEmpty(message.systemMessage)
CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> return message.id == "-1" CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> message.id == "-1"
else -> false
} }
return false
} }
@Subscribe(threadMode = ThreadMode.BACKGROUND) @Subscribe(threadMode = ThreadMode.BACKGROUND)
@ -1942,7 +1945,7 @@ class ChatController(args: Bundle) :
router.popCurrentController() router.popCurrentController()
} }
}, },
100 POP_CURRENT_CONTROLLER_DELAY
) )
} }
} }
@ -1959,9 +1962,15 @@ class ChatController(args: Bundle) :
} }
companion object { companion object {
private val TAG = "ChatController" private const val TAG = "ChatController"
private val CONTENT_TYPE_SYSTEM_MESSAGE: Byte = 1 private const val CONTENT_TYPE_SYSTEM_MESSAGE: Byte = 1
private val CONTENT_TYPE_UNREAD_NOTICE_MESSAGE: Byte = 2 private const val CONTENT_TYPE_UNREAD_NOTICE_MESSAGE: Byte = 2
val REQUEST_CODE_CHOOSE_FILE: Int = 555 private const val NEW_MESSAGES_POPUP_BUBBLE_DELAY: Long = 200
private const val POP_CURRENT_CONTROLLER_DELAY: Long = 100
private const val LOBBY_TIMER_DELAY: Long = 5000
private const val HTTP_CODE_OK: Int = 200
private const val MESSAGE_MAX_LENGTH: Int = 1000
private const val AGE_THREHOLD_FOR_DELETE_MESSAGE: Int = 21600000 // (6 hours in millis = 6 * 3600 * 1000)
private const val REQUEST_CODE_CHOOSE_FILE: Int = 555
} }
} }

14
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -181,10 +181,7 @@ class ConversationInfoController(args: Bundle) :
private fun setupWebinaryView() { private fun setupWebinaryView() {
if (CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "webinary-lobby") && if (CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "webinary-lobby") &&
( webinaryRoomType(conversation!!) &&
conversation!!.type == Conversation.ConversationType.ROOM_GROUP_CALL ||
conversation!!.type == Conversation.ConversationType.ROOM_PUBLIC_CALL
) &&
conversation!!.canModerate(conversationUser) conversation!!.canModerate(conversationUser)
) { ) {
binding.webinarInfoView.webinarSettings.visibility = View.VISIBLE binding.webinarInfoView.webinarSettings.visibility = View.VISIBLE
@ -227,6 +224,11 @@ class ConversationInfoController(args: Bundle) :
} }
} }
private fun webinaryRoomType(conversation: Conversation): Boolean {
return conversation.type == Conversation.ConversationType.ROOM_GROUP_CALL ||
conversation.type == Conversation.ConversationType.ROOM_PUBLIC_CALL
}
fun reconfigureLobbyTimerView(dateTime: Calendar? = null) { fun reconfigureLobbyTimerView(dateTime: Calendar? = null) {
val isChecked = val isChecked =
(binding.webinarInfoView.conversationInfoLobby.findViewById<View>(R.id.mp_checkable) as SwitchCompat) (binding.webinarInfoView.conversationInfoLobby.findViewById<View>(R.id.mp_checkable) as SwitchCompat)
@ -595,7 +597,7 @@ class ConversationInfoController(args: Bundle) :
} }
} else { } else {
binding.notificationSettingsView.conversationInfoMessageNotifications.isEnabled = false binding.notificationSettingsView.conversationInfoMessageNotifications.isEnabled = false
binding.notificationSettingsView.conversationInfoMessageNotifications.alpha = 0.38f binding.notificationSettingsView.conversationInfoMessageNotifications.alpha = LOW_EMPHASIS_OPACITY
setProperNotificationValue(conversation) setProperNotificationValue(conversation)
} }
} }
@ -963,9 +965,9 @@ class ConversationInfoController(args: Bundle) :
} }
companion object { companion object {
private const val TAG = "ConversationInfoController" private const val TAG = "ConversationInfoController"
private const val ID_DELETE_CONVERSATION_DIALOG = 0 private const val ID_DELETE_CONVERSATION_DIALOG = 0
private val LOW_EMPHASIS_OPACITY: Float = 0.38f
} }
/** /**

29
app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
View File

@ -78,6 +78,7 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
protected open val title: String? protected open val title: String?
get() = null get() = null
@Suppress("Detekt.TooGenericExceptionCaught")
protected val actionBar: ActionBar? protected val actionBar: ActionBar?
get() { get() {
var actionBarProvider: ActionBarProvider? = null var actionBarProvider: ActionBarProvider? = null
@ -224,20 +225,32 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
} }
protected fun setTitle() { protected fun setTitle() {
if (title != null && actionBar != null) { if (isTitleSetable()) {
run { run {
var parentController = parentController calculateValidParentController()
while (parentController != null) {
if (parentController is BaseController && parentController.title != null) {
return
}
parentController = parentController.parentController
}
} }
actionBar!!.title = title actionBar!!.title = title
} }
} }
private fun calculateValidParentController() {
var parentController = parentController
while (parentController != null) {
if (isValidController(parentController)) {
return
}
parentController = parentController.parentController
}
}
private fun isValidController(parentController: Controller): Boolean {
return parentController is BaseController && parentController.title != null
}
private fun isTitleSetable(): Boolean {
return title != null && actionBar != null
}
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == android.R.id.home) { if (item.itemId == android.R.id.home) {
router.popCurrentController() router.popCurrentController()

188
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -157,6 +157,7 @@ public class OperationsMenuController extends BaseController {
} }
@NonNull
@Override @Override
protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) { protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
return inflater.inflate(R.layout.controller_operations_menu, container, false); return inflater.inflate(R.layout.controller_operations_menu, container, false);
@ -222,17 +223,23 @@ public class OperationsMenuController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CapabilitiesOverall>() { .subscribe(new Observer<CapabilitiesOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
} }
@SuppressLint("LongLogTag") @SuppressLint("LongLogTag")
@Override @Override
public void onNext(CapabilitiesOverall capabilitiesOverall) { public void onNext(@io.reactivex.annotations.NonNull CapabilitiesOverall capabilitiesOverall) {
currentUser = new UserEntity(); currentUser = new UserEntity();
currentUser.setBaseUrl(baseUrl); currentUser.setBaseUrl(baseUrl);
currentUser.setUserId("?"); currentUser.setUserId("?");
try { try {
currentUser.setCapabilities(LoganSquare.serialize(capabilitiesOverall.getOcs().getData().getCapabilities())); currentUser.setCapabilities(
LoganSquare
.serialize(
capabilitiesOverall
.getOcs()
.getData()
.getCapabilities()));
} catch (IOException e) { } catch (IOException e) {
Log.e("OperationsMenu", "Failed to serialize capabilities"); Log.e("OperationsMenu", "Failed to serialize capabilities");
} }
@ -248,7 +255,7 @@ public class OperationsMenuController extends BaseController {
@SuppressLint("LongLogTag") @SuppressLint("LongLogTag")
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
showResultImage(false, false); showResultImage(false, false);
Log.e(TAG, "Error fetching capabilities for guest", e); Log.e(TAG, "Error fetching capabilities for guest", e);
} }
@ -325,12 +332,12 @@ public class OperationsMenuController extends BaseController {
.retry(1) .retry(1)
.subscribe(new Observer<RoomOverall>() { .subscribe(new Observer<RoomOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
disposable = d; disposable = d;
} }
@Override @Override
public void onNext(RoomOverall roomOverall) { public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
conversation = roomOverall.getOcs().getData(); conversation = roomOverall.getOcs().getData();
if (conversation.isHasPassword() && conversation.isGuest()) { if (conversation.isHasPassword() && conversation.isGuest()) {
eventBus.post(new BottomSheetLockEvent(true, 0, eventBus.post(new BottomSheetLockEvent(true, 0,
@ -358,25 +365,27 @@ public class OperationsMenuController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<RoomOverall>() { .subscribe(new Observer<RoomOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(
@io.reactivex.annotations.NonNull Disposable d
) {
} }
@Override @Override
public void onNext(RoomOverall roomOverall) { public void onNext(
@io.reactivex.annotations.NonNull RoomOverall roomOverall
) {
conversation = roomOverall.getOcs().getData(); conversation = roomOverall.getOcs().getData();
initiateConversation(false); initiateConversation(false);
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
showResultImage(false, false); showResultImage(false, false);
dispose(); dispose();
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} else { } else {
@ -385,7 +394,7 @@ public class OperationsMenuController extends BaseController {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
showResultImage(false, false); showResultImage(false, false);
dispose(); dispose();
} }
@ -418,12 +427,12 @@ public class OperationsMenuController extends BaseController {
.retry(1) .retry(1)
.subscribe(new Observer<RoomOverall>() { .subscribe(new Observer<RoomOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(RoomOverall roomOverall) { public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
conversation = roomOverall.getOcs().getData(); conversation = roomOverall.getOcs().getData();
ncApi.getRoom(credentials, ncApi.getRoom(credentials,
@ -433,18 +442,20 @@ public class OperationsMenuController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<RoomOverall>() { .subscribe(new Observer<RoomOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(RoomOverall roomOverall) { public void onNext(
@io.reactivex.annotations.NonNull RoomOverall roomOverall
) {
conversation = roomOverall.getOcs().getData(); conversation = roomOverall.getOcs().getData();
inviteUsersToAConversation(); inviteUsersToAConversation();
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
showResultImage(false, false); showResultImage(false, false);
dispose(); dispose();
} }
@ -458,7 +469,7 @@ public class OperationsMenuController extends BaseController {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
showResultImage(false, false); showResultImage(false, false);
dispose(); dispose();
} }
@ -510,12 +521,16 @@ public class OperationsMenuController extends BaseController {
private void showResultImage(boolean everythingOK, boolean isGuestSupportError) { private void showResultImage(boolean everythingOK, boolean isGuestSupportError) {
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
if (everythingOK) { if (getResources() != null) {
resultImageView.setImageDrawable(DisplayUtils.getTintedDrawable(getResources(), R.drawable if (everythingOK) {
.ic_check_circle_black_24dp, R.color.nc_darkGreen)); resultImageView.setImageDrawable(DisplayUtils.getTintedDrawable(getResources(),
} else { R.drawable.ic_check_circle_black_24dp,
resultImageView.setImageDrawable(DisplayUtils.getTintedDrawable(getResources(), R.drawable R.color.nc_darkGreen));
.ic_cancel_black_24dp, R.color.nc_darkRed)); } else {
resultImageView.setImageDrawable(DisplayUtils.getTintedDrawable(getResources(),
R.drawable.ic_cancel_black_24dp,
R.color.nc_darkRed));
}
} }
resultImageView.setVisibility(View.VISIBLE); resultImageView.setVisibility(View.VISIBLE);
@ -583,59 +598,79 @@ public class OperationsMenuController extends BaseController {
if (localInvitedUsers.size() > 0 || (localInvitedGroups.size() > 0 && if (localInvitedUsers.size() > 0 || (localInvitedGroups.size() > 0 &&
CapabilitiesUtil.hasSpreedFeatureCapability(currentUser, "invite-groups-and-mails"))) { CapabilitiesUtil.hasSpreedFeatureCapability(currentUser, "invite-groups-and-mails"))) {
if ((localInvitedGroups.size() > 0 && addGroupsToConversation(localInvitedUsers, localInvitedGroups, apiVersion);
CapabilitiesUtil.hasSpreedFeatureCapability(currentUser, "invite-groups-and-mails"))) { addUsersToConversation(localInvitedUsers, localInvitedGroups, apiVersion);
for (int i = 0; i < localInvitedGroups.size(); i++) { } else {
final String groupId = localInvitedGroups.get(i); initiateConversation(true);
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource( }
apiVersion, }
currentUser.getBaseUrl(),
conversation.getToken(),
"groups",
groupId
);
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) private void addUsersToConversation(
.subscribeOn(Schedulers.io()) ArrayList<String> localInvitedUsers,
.observeOn(AndroidSchedulers.mainThread()) ArrayList<String> localInvitedGroups,
.retry(1) int apiVersion)
.subscribe(new Observer<AddParticipantOverall>() { {
@Override RetrofitBucket retrofitBucket;
public void onSubscribe(Disposable d) { for (int i = 0; i < localInvitedUsers.size(); i++) {
final String userId = invitedUsers.get(i);
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipant(apiVersion,
currentUser.getBaseUrl(),
conversation.getToken(),
userId);
} ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retry(1)
.subscribe(new Observer<AddParticipantOverall>() {
@Override
public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
@Override }
public void onNext(AddParticipantOverall addParticipantOverall) {
}
@Override @Override
public void onError(Throwable e) { public void onNext(
dispose(); @io.reactivex.annotations.NonNull AddParticipantOverall addParticipantOverall
} ) {
}
@Override @Override
public void onComplete() { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
synchronized (localInvitedGroups) { dispose();
localInvitedGroups.remove(groupId); }
}
if (localInvitedGroups.size() == 0 && localInvitedUsers.size() == 0) { @Override
initiateConversation(true); public void onComplete() {
} synchronized (localInvitedUsers) {
dispose(); localInvitedUsers.remove(userId);
} }
});
} if (localInvitedGroups.size() == 0 && localInvitedUsers.size() == 0) {
} initiateConversation(true);
}
dispose();
}
});
}
}
for (int i = 0; i < localInvitedUsers.size(); i++) { private void addGroupsToConversation(
final String userId = invitedUsers.get(i); ArrayList<String> localInvitedUsers,
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipant(apiVersion, ArrayList<String> localInvitedGroups,
currentUser.getBaseUrl(), int apiVersion)
conversation.getToken(), {
userId); RetrofitBucket retrofitBucket;
if ((localInvitedGroups.size() > 0 &&
CapabilitiesUtil.hasSpreedFeatureCapability(currentUser, "invite-groups-and-mails"))) {
for (int i = 0; i < localInvitedGroups.size(); i++) {
final String groupId = localInvitedGroups.get(i);
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
apiVersion,
currentUser.getBaseUrl(),
conversation.getToken(),
"groups",
groupId
);
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -643,23 +678,25 @@ public class OperationsMenuController extends BaseController {
.retry(1) .retry(1)
.subscribe(new Observer<AddParticipantOverall>() { .subscribe(new Observer<AddParticipantOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(AddParticipantOverall addParticipantOverall) { public void onNext(
@io.reactivex.annotations.NonNull AddParticipantOverall addParticipantOverall
) {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
dispose(); dispose();
} }
@Override @Override
public void onComplete() { public void onComplete() {
synchronized (localInvitedUsers) { synchronized (localInvitedGroups) {
localInvitedUsers.remove(userId); localInvitedGroups.remove(groupId);
} }
if (localInvitedGroups.size() == 0 && localInvitedUsers.size() == 0) { if (localInvitedGroups.size() == 0 && localInvitedUsers.size() == 0) {
@ -668,9 +705,8 @@ public class OperationsMenuController extends BaseController {
dispose(); dispose();
} }
}); });
} }
} else {
initiateConversation(true);
} }
} }

6
app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
View File

@ -193,16 +193,16 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
fun isStoragePermissionGranted(context: Context): Boolean { fun isStoragePermissionGranted(context: Context): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (PermissionChecker.checkSelfPermission( return if (PermissionChecker.checkSelfPermission(
context, context,
Manifest.permission.WRITE_EXTERNAL_STORAGE Manifest.permission.WRITE_EXTERNAL_STORAGE
) == PermissionChecker.PERMISSION_GRANTED ) == PermissionChecker.PERMISSION_GRANTED
) { ) {
Log.d(TAG, "Permission is granted") Log.d(TAG, "Permission is granted")
return true true
} else { } else {
Log.d(TAG, "Permission is revoked") Log.d(TAG, "Permission is revoked")
return false false
} }
} else { // permission is automatically granted on sdk<23 upon installation } else { // permission is automatically granted on sdk<23 upon installation
Log.d(TAG, "Permission is granted") Log.d(TAG, "Permission is granted")

2
detekt.yml
View File

@ -1,5 +1,5 @@
build: build:
maxIssues: 217 maxIssues: 201
weights: weights:
# complexity: 2 # complexity: 2
# LongParameterList: 1 # LongParameterList: 1