diff --git a/app/build.gradle b/app/build.gradle index dd9ac579b..23b8cc9f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -237,7 +237,6 @@ dependencies { implementation 'net.orange-box.storebox:storebox-lib:1.4.0' implementation "com.jakewharton:butterknife:${butterknifeVersion}" kapt "com.jakewharton:butterknife-compiler:${butterknifeVersion}" - implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5' implementation 'eu.davidea:flexible-adapter:5.1.0' implementation 'eu.davidea:flexible-adapter-ui:1.0.0' implementation 'org.webrtc:google-webrtc:1.0.32006' diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java index 91b2d0fcd..30fbe3d2d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java @@ -27,9 +27,9 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.Typeface; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; +import android.os.Build; import android.text.TextUtils; import android.text.format.DateUtils; import android.view.View; @@ -215,13 +215,16 @@ public class ConversationItem extends AbstractFlexibleItem= Build.VERSION_CODES.O) { + Drawable[] layers = new Drawable[2]; + layers[0] = ContextCompat.getDrawable(context, R.drawable.ic_launcher_background); + layers[1] = ContextCompat.getDrawable(context, R.drawable.ic_launcher_foreground); + LayerDrawable layerDrawable = new LayerDrawable(layers); + holder.dialogAvatar.getHierarchy().setPlaceholderImage(DisplayUtils.getRoundedDrawable(layerDrawable)); + } else { + holder.dialogAvatar.getHierarchy().setPlaceholderImage(R.mipmap.ic_launcher); + } shouldLoadAvatar = false; } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt index 40d06ef08..870a0951f 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -28,11 +28,11 @@ import android.annotation.SuppressLint import android.content.Context 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 android.widget.SeekBar -import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.view.ViewCompat @@ -201,11 +201,15 @@ class IncomingVoiceMessageViewHolder(incomingView: View) : MessageHolders if (message.actorType == "guests") { // do nothing, avatar is set } else if (message.actorType == "bots" && message.actorId == "changelog") { - val layers = arrayOfNulls(2) - layers[0] = AppCompatResources.getDrawable(context!!, R.drawable.ic_launcher_background) - layers[1] = AppCompatResources.getDrawable(context!!, R.drawable.ic_launcher_foreground) - val layerDrawable = LayerDrawable(layers) - binding.messageUserAvatar.setImageDrawable(DisplayUtils.getRoundedDrawable(layerDrawable)) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val layers = arrayOfNulls(2) + layers[0] = ContextCompat.getDrawable(context!!, R.drawable.ic_launcher_background) + layers[1] = ContextCompat.getDrawable(context!!, R.drawable.ic_launcher_foreground) + val layerDrawable = LayerDrawable(layers) + binding.messageUserAvatar.setImageDrawable(DisplayUtils.getRoundedDrawable(layerDrawable)) + } else { + binding.messageUserAvatar.setImageResource(R.mipmap.ic_launcher) + } } else if (message.actorType == "bots") { val drawable = TextDrawable.builder() .beginConfig() diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt index 21e9b6d49..80023f38c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt @@ -27,6 +27,7 @@ import android.content.Intent import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable import android.net.Uri +import android.os.Build import android.text.Spannable import android.text.SpannableString import android.text.TextUtils @@ -81,11 +82,15 @@ class MagicIncomingTextMessageViewHolder(itemView: View) : MessageHolders // do nothing, avatar is set } else if (message.actorType == "bots" && message.actorId == "changelog") { if (context != null) { - val layers = arrayOfNulls(2) - layers[0] = ContextCompat.getDrawable(context!!, R.drawable.ic_launcher_background) - layers[1] = ContextCompat.getDrawable(context!!, R.drawable.ic_launcher_foreground) - val layerDrawable = LayerDrawable(layers) - binding.messageUserAvatar.setImageDrawable(DisplayUtils.getRoundedDrawable(layerDrawable)) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val layers = arrayOfNulls(2) + layers[0] = ContextCompat.getDrawable(context!!, R.drawable.ic_launcher_background) + layers[1] = ContextCompat.getDrawable(context!!, R.drawable.ic_launcher_foreground) + val layerDrawable = LayerDrawable(layers) + binding.messageUserAvatar.setImageDrawable(DisplayUtils.getRoundedDrawable(layerDrawable)) + } else { + binding.messageUserAvatar.setImageResource(R.mipmap.ic_launcher) + } } } else if (message.actorType == "bots") { val drawable = TextDrawable.builder() diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java index ad8ed5893..29d0ce775 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java @@ -20,6 +20,8 @@ package com.nextcloud.talk.components.filebrowser.webdav; +import android.util.Log; + import com.nextcloud.talk.components.filebrowser.models.BrowserFile; import com.nextcloud.talk.components.filebrowser.models.DavResponse; import com.nextcloud.talk.dagger.modules.RestModule; @@ -39,6 +41,7 @@ import okhttp3.HttpUrl; import okhttp3.OkHttpClient; public class ReadFilesystemOperation { + private static final String TAG = "ReadFilesystemOperation"; private final OkHttpClient okHttpClient; private final String url; private final int depth; @@ -48,7 +51,14 @@ public class ReadFilesystemOperation { OkHttpClient.Builder okHttpClientBuilder = okHttpClient.newBuilder(); okHttpClientBuilder.followRedirects(false); okHttpClientBuilder.followSslRedirects(false); - okHttpClientBuilder.authenticator(new RestModule.MagicAuthenticator(ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), "Authorization")); + okHttpClientBuilder.authenticator( + new RestModule.MagicAuthenticator( + ApiUtils.getCredentials( + currentUser.getUsername(), + currentUser.getToken() + ), + "Authorization") + ); this.okHttpClient = okHttpClientBuilder.build(); this.basePath = currentUser.getBaseUrl() + DavUtils.DAV_PATH + currentUser.getUserId(); this.url = basePath + path; @@ -80,13 +90,10 @@ public class ReadFilesystemOperation { return Unit.INSTANCE; } }); - } catch (IOException e) { - e.printStackTrace(); - } catch (DavException e) { - e.printStackTrace(); + } catch (IOException | DavException e) { + Log.w("", "Error reading remote path"); } - remoteFiles.add(BrowserFile.getModelFromResponse(rootElement[0], rootElement[0].getHref().toString().substring(basePath.length()))); for (Response memberElement : memberElements) { @@ -97,5 +104,4 @@ public class ReadFilesystemOperation { davResponse.setData(remoteFiles); return davResponse; } - } diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java index cf3458353..ef8fc2a14 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java @@ -55,7 +55,7 @@ public class UserUtils { public List getUsers() { Result findUsersQueryResult = dataStore.select(User.class).where - (UserEntity.SCHEDULED_FOR_DELETION.notEqual(true)).get(); + (UserEntity.SCHEDULED_FOR_DELETION.notEqual(Boolean.TRUE)).get(); return findUsersQueryResult.toList(); } diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 210a55682..8e9192559 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 274 warnings + Lint Report: 3 errors and 272 warnings