gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

housekeeping: cleanup after spotbug fixes

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-12-28 12:14:07 +01:00
parent 8b61808fda
commit b07ee434fe
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -90,7 +90,6 @@ import com.nextcloud.talk.utils.NotificationUtils;
import com.nextcloud.talk.utils.animations.PulseAnimation;
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil;
import com.nextcloud.talk.utils.power.PowerManagerUtils;
import com.nextcloud.talk.utils.preferences.AppPreferences;
import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder;
import com.nextcloud.talk.webrtc.MagicWebRTCUtils;
import com.nextcloud.talk.webrtc.MagicWebSocketInstance;
@ -100,7 +99,6 @@ import com.nextcloud.talk.webrtc.WebSocketConnectionHelper;
import com.wooplr.spotlight.SpotlightView;
import org.apache.commons.lang3.StringEscapeUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.webrtc.AudioSource;

18
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java
View File

@ -22,8 +22,6 @@
package com.nextcloud.talk.components.filebrowser.webdav;
import android.util.Log;
import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted;
import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission;
import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview;
@ -31,14 +29,10 @@ import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite;
import com.nextcloud.talk.components.filebrowser.models.properties.OCId;
import com.nextcloud.talk.components.filebrowser.models.properties.OCSize;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4jvm.PropertyRegistry;
import at.bitfire.dav4jvm.property.CreationDate;
import at.bitfire.dav4jvm.property.DisplayName;
@ -49,7 +43,6 @@ import at.bitfire.dav4jvm.property.GetLastModified;
import at.bitfire.dav4jvm.property.ResourceType;
public class DavUtils {
private static final String TAG = "DavUtils";
public static final String OC_NAMESPACE = "http://owncloud.org/ns";
public static final String NC_NAMESPACE = "http://nextcloud.org/ns";
@ -66,12 +59,13 @@ public class DavUtils {
public static final String EXTENDED_PROPERTY_UNREAD_COMMENTS = "comments-unread";
public static final String EXTENDED_PROPERTY_HAS_PREVIEW = "has-preview";
public static final String EXTENDED_PROPERTY_NOTE = "note";
public static final String TRASHBIN_FILENAME = "trashbin-filename";
public static final String TRASHBIN_ORIGINAL_LOCATION = "trashbin-original-location";
public static final String TRASHBIN_DELETION_TIME = "trashbin-deletion-time";
public static final String PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes";
public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes";
// public static final String TRASHBIN_FILENAME = "trashbin-filename";
// public static final String TRASHBIN_ORIGINAL_LOCATION = "trashbin-original-location";
// public static final String TRASHBIN_DELETION_TIME = "trashbin-deletion-time";
// public static final String PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes";
// public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes";
static Property.Name[] getAllPropSet() {
List<Property.Name> props = new ArrayList<>(20);

7
app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java
View File

@ -56,10 +56,9 @@ public class MagicCharPolicy implements AutocompletePolicy {
Matcher matcher = pattern.matcher(text);
while (matcher.find()) {
if (cursorPos >= matcher.start() && cursorPos <= matcher.end()) {
if (text.subSequence(matcher.start(), matcher.end()).charAt(0) == character) {
return new TextSpan(matcher.start(), matcher.end());
}
if (cursorPos >= matcher.start() && cursorPos <= matcher.end() &&
text.subSequence(matcher.start(), matcher.end()).charAt(0) == character) {
return new TextSpan(matcher.start(), matcher.end());
}
}