From b50501a38f1f847a01bb9c848afe2a743f4d797f Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 9 Feb 2021 12:13:06 +0100 Subject: [PATCH 1/4] bump google-webrtc to 1.0.32006 Signed-off-by: Marcel Hibbe --- app/build.gradle | 3 ++- .../talk/adapters/items/UserItem.java | 2 +- .../application/NextcloudTalkApplication.kt | 11 +++----- .../talk/controllers/CallController.java | 27 ++++++++++++------- .../CallNotificationController.java | 2 +- .../com/nextcloud/talk/utils/ApiUtils.java | 3 +-- .../nextcloud/talk/utils/DisplayUtils.java | 10 +++---- 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fff38a256..794c7925b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -202,7 +202,7 @@ dependencies { 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.23295' + implementation 'org.webrtc:google-webrtc:1.0.32006' implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" implementation 'com.yarolegovich:lovely-dialog:1.1.0' implementation 'com.yarolegovich:lovelyinput:1.0.9' @@ -210,6 +210,7 @@ dependencies { implementation 'me.zhanghai.android.effortlesspermissions:library:1.1.0' implementation 'org.apache.commons:commons-lang3:3.9' implementation 'com.github.wooplr:Spotlight:1.3' + implementation 'com.google.code.findbugs:jsr305:2.0.1' implementation('com.github.mario:chatkit:c6a61767291ddb212a2f4f792a2b6aaf295e69a5', { exclude group: 'com.facebook.fresco' }) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java index e4de0f499..1859bc684 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java @@ -40,7 +40,7 @@ import com.nextcloud.talk.utils.DisplayUtils; import java.util.List; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import androidx.annotation.Nullable; import androidx.emoji.widget.EmojiTextView; import butterknife.BindView; diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt index 255f69f26..bf897e11d 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt @@ -25,10 +25,9 @@ import android.os.Build import android.os.Build.VERSION.SDK_INT import android.os.Build.VERSION_CODES.P import android.util.Log +import androidx.appcompat.app.AppCompatDelegate import androidx.emoji.bundled.BundledEmojiCompatConfig import androidx.emoji.text.EmojiCompat - -import androidx.appcompat.app.AppCompatDelegate import androidx.lifecycle.LifecycleObserver import androidx.multidex.MultiDex import androidx.multidex.MultiDexApplication @@ -66,7 +65,6 @@ import com.nextcloud.talk.utils.preferences.AppPreferences import com.nextcloud.talk.webrtc.MagicWebRTCUtils import com.vanniktech.emoji.EmojiManager import com.vanniktech.emoji.googlecompat.GoogleCompatEmojiProvider - import de.cotech.hw.SecurityKeyManager import de.cotech.hw.SecurityKeyManagerConfig import okhttp3.OkHttpClient @@ -74,11 +72,10 @@ import org.conscrypt.Conscrypt import org.webrtc.PeerConnectionFactory import org.webrtc.voiceengine.WebRtcAudioManager import org.webrtc.voiceengine.WebRtcAudioUtils - -import javax.inject.Inject -import javax.inject.Singleton import java.security.Security import java.util.concurrent.TimeUnit +import javax.inject.Inject +import javax.inject.Singleton @AutoComponent(modules = [BusModule::class, ContextModule::class, DatabaseModule::class, RestModule::class, UserModule::class, ArbitraryStorageModule::class]) @Singleton @@ -108,9 +105,7 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver { WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true) } - PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(this) - .setEnableVideoHwAcceleration(MagicWebRTCUtils.shouldEnableVideoHardwareAcceleration()) .createInitializationOptions()) } catch (e: UnsatisfiedLinkError) { Log.w(TAG, e) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index 75e962bdd..490c95178 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -107,6 +107,8 @@ import org.webrtc.Camera1Enumerator; import org.webrtc.Camera2Enumerator; import org.webrtc.CameraEnumerator; import org.webrtc.CameraVideoCapturer; +import org.webrtc.DefaultVideoDecoderFactory; +import org.webrtc.DefaultVideoEncoderFactory; import org.webrtc.EglBase; import org.webrtc.IceCandidate; import org.webrtc.Logging; @@ -116,6 +118,7 @@ import org.webrtc.PeerConnection; import org.webrtc.PeerConnectionFactory; import org.webrtc.RendererCommon; import org.webrtc.SessionDescription; +import org.webrtc.SurfaceTextureHelper; import org.webrtc.SurfaceViewRenderer; import org.webrtc.VideoCapturer; import org.webrtc.VideoSource; @@ -358,10 +361,15 @@ public class CallController extends BaseController { //Create a new PeerConnectionFactory instance. PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); - peerConnectionFactory = PeerConnectionFactory.builder().createPeerConnectionFactory(); + DefaultVideoEncoderFactory defaultVideoEncoderFactory = new DefaultVideoEncoderFactory( + rootEglBase.getEglBaseContext(),true,true); + DefaultVideoDecoderFactory defaultVideoDecoderFactory = new DefaultVideoDecoderFactory(rootEglBase.getEglBaseContext()); - peerConnectionFactory.setVideoHwAccelerationOptions(rootEglBase.getEglBaseContext(), - rootEglBase.getEglBaseContext()); + peerConnectionFactory = PeerConnectionFactory.builder() + .setOptions(options) + .setVideoEncoderFactory(defaultVideoEncoderFactory) + .setVideoDecoderFactory(defaultVideoDecoderFactory) + .createPeerConnectionFactory(); //Create MediaConstraints - Will be useful for specifying video and audio constraints. audioConstraints = new MediaConstraints(); @@ -584,13 +592,14 @@ public class CallController extends BaseController { //Create a VideoSource instance if (videoCapturer != null) { - videoSource = peerConnectionFactory.createVideoSource(videoCapturer); - localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource); - localMediaStream.addTrack(localVideoTrack); - localVideoTrack.setEnabled(false); - localVideoTrack.addSink(pipVideoView); + SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create("CaptureThread", rootEglBase.getEglBaseContext()); + videoSource = peerConnectionFactory.createVideoSource(false); + videoCapturer.initialize(surfaceTextureHelper, getApplicationContext(), videoSource.getCapturerObserver()); } - + localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource); + localMediaStream.addTrack(localVideoTrack); + localVideoTrack.setEnabled(false); + localVideoTrack.addSink(pipVideoView); } private void microphoneInitialization() { diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 486418bc2..51c7339da 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -45,6 +45,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import com.bluelinelabs.conductor.RouterTransaction; @@ -89,7 +90,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; import javax.inject.Inject; import autodagger.AutoInjector; diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index f7ade0a90..76159e641 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -23,6 +23,7 @@ import android.net.Uri; import android.text.TextUtils; import androidx.annotation.DimenRes; +import androidx.annotation.Nullable; import com.nextcloud.talk.BuildConfig; import com.nextcloud.talk.R; @@ -32,8 +33,6 @@ import com.nextcloud.talk.models.RetrofitBucket; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nullable; - import okhttp3.Credentials; public class ApiUtils { diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java index cd57ab347..8e4fabf98 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java @@ -56,6 +56,7 @@ import androidx.annotation.ColorInt; import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.XmlRes; import androidx.appcompat.widget.AppCompatDrawableManager; import androidx.core.content.ContextCompat; @@ -96,9 +97,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class DisplayUtils { private static final String TAG = "DisplayUtils"; @@ -107,7 +105,7 @@ public class DisplayUtils { SpannableString spannableString = new SpannableString(string); spannableString.setSpan(new ClickableSpan() { @Override - public void onClick(@Nonnull View widget) { + public void onClick(@NonNull View widget) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); NextcloudTalkApplication.Companion.getSharedApplication().getApplicationContext().startActivity(browserIntent); @@ -181,12 +179,12 @@ public class DisplayUtils { } @Override - public void onFinalImageSet(String id, @javax.annotation.Nullable Object imageInfo, @javax.annotation.Nullable Animatable animatable) { + public void onFinalImageSet(String id, @androidx.annotation.Nullable Object imageInfo, @androidx.annotation.Nullable Animatable animatable) { updateViewSize((ImageInfo) imageInfo, draweeView); } @Override - public void onIntermediateImageSet(String id, @javax.annotation.Nullable Object imageInfo) { + public void onIntermediateImageSet(String id, @androidx.annotation.Nullable Object imageInfo) { updateViewSize((ImageInfo) imageInfo, draweeView); } From d7bc01e954cc15b0f3be68906a9495b7103dead9 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 10 Feb 2021 14:35:25 +0100 Subject: [PATCH 2/4] resolve some lint warnings Signed-off-by: Marcel Hibbe --- .../messages/MagicIncomingTextMessageViewHolder.kt | 6 +++--- .../messages/MagicOutcomingTextMessageViewHolder.kt | 10 +++++----- .../com/nextcloud/talk/controllers/ChatController.kt | 2 +- .../talk/controllers/base/ButterKnifeController.kt | 4 ++-- .../nextcloud/talk/jobs/UploadAndShareFilesWorker.kt | 2 +- .../com/nextcloud/talk/ui/dialog/AttachmentDialog.kt | 12 ++++++------ .../com/nextcloud/talk/utils/NotificationUtils.kt | 2 +- app/src/main/res/layout/item_message_quote.xml | 1 - 8 files changed, 19 insertions(+), 20 deletions(-) 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 e2f6b5c56..f8015062d 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 @@ -160,7 +160,7 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders val resources = itemView.resources - val bg_bubble_color = if (message.isDeleted) { + val bgBubbleColor = if (message.isDeleted) { resources.getColor(R.color.bg_message_list_incoming_bubble_deleted) } else { resources.getColor(R.color.bg_message_list_incoming_bubble) @@ -173,9 +173,9 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders } val bubbleDrawable = DisplayUtils.getMessageSelector( - bg_bubble_color, + bgBubbleColor, resources.getColor(R.color.transparent), - bg_bubble_color, bubbleResource + bgBubbleColor, bubbleResource ) ViewCompat.setBackground(bubble, bubbleDrawable) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt index 6560aef2b..7d565edc2 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt @@ -136,23 +136,23 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage realView.isSelected = true } val resources = sharedApplication!!.resources - val bg_bubble_color = if (message.isDeleted) { + val bgBubbleColor = if (message.isDeleted) { resources.getColor(R.color.bg_message_list_outcoming_bubble_deleted) } else { resources.getColor(R.color.bg_message_list_outcoming_bubble) } if (message.isGrouped) { val bubbleDrawable = getMessageSelector( - bg_bubble_color, + bgBubbleColor, resources.getColor(R.color.transparent), - bg_bubble_color, + bgBubbleColor, R.drawable.shape_grouped_outcoming_message) ViewCompat.setBackground(bubble, bubbleDrawable) } else { val bubbleDrawable = getMessageSelector( - bg_bubble_color, + bgBubbleColor, resources.getColor(R.color.transparent), - bg_bubble_color, + bgBubbleColor, R.drawable.shape_outcoming_message) ViewCompat.setBackground(bubble, bubbleDrawable) } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 2eea67577..b95f4c8db 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -747,7 +747,7 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter } } - override fun getTitle(): String? { + override fun getTitle(): String { currentConversation?.displayName?.let { return EmojiCompat.get().process(it as CharSequence).toString() } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt index 630219e24..e6191f49f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt @@ -33,9 +33,9 @@ abstract class ButterKnifeController : Controller { private var unbinder: Unbinder? = null - constructor() {} + constructor() - constructor(args: Bundle) : super(args) {} + constructor(args: Bundle) : super(args) protected abstract fun inflateView(inflater: LayoutInflater, container: ViewGroup): View diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt index c4a1db980..330503c2a 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt @@ -146,7 +146,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa WorkManager.getInstance().enqueue(shareWorker) } - private fun getFileName(uri: Uri): String? { + private fun getFileName(uri: Uri): String { var filename: String? = null if (uri.scheme == "content") { val cursor: Cursor? = context.contentResolver.query(uri, null, null, null, null) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt index 300209207..e4b70a83e 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt @@ -46,16 +46,16 @@ class AttachmentDialog(val activity: Activity, var chatController :ChatControlle private var unbinder: Unbinder? = null override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState); - val view = layoutInflater.inflate(R.layout.dialog_attachment, null); - setContentView(view); + super.onCreate(savedInstanceState) + val view = layoutInflater.inflate(R.layout.dialog_attachment, null) + setContentView(view) - window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) - unbinder = ButterKnife.bind(this, view); + unbinder = ButterKnife.bind(this, view) attachFromLocal?.setOnClickListener { - chatController.sendSelectLocalFileIntent(); + chatController.sendSelectLocalFileIntent() dismiss() } attachFromCloud?.setOnClickListener { diff --git a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt index e3d7aaa1d..f91f6636a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt @@ -43,7 +43,7 @@ object NotificationUtils { val NOTIFICATION_CHANNEL_MESSAGES_V3 = "NOTIFICATION_CHANNEL_MESSAGES_V3" val NOTIFICATION_CHANNEL_CALLS_V3 = "NOTIFICATION_CHANNEL_CALLS_V3" - fun getVibrationEffectForCalls(): LongArray? { + fun getVibrationEffectForCalls(): LongArray { return longArrayOf(0L, 400L, 800L, 600L, 800L, 800L, 800L, 1000L) } diff --git a/app/src/main/res/layout/item_message_quote.xml b/app/src/main/res/layout/item_message_quote.xml index fa87f1b02..6fff959dd 100644 --- a/app/src/main/res/layout/item_message_quote.xml +++ b/app/src/main/res/layout/item_message_quote.xml @@ -82,7 +82,6 @@ android:textSize="12sp" app:layout_alignSelf="center" tools:text="16:08" /> - /> From 18714b2b8bcfc667e4fe775cdbaddd7375689fd5 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 10 Feb 2021 15:07:13 +0100 Subject: [PATCH 3/4] resolve some lint warnings Signed-off-by: Marcel Hibbe --- .../talk/controllers/AccountVerificationController.java | 6 ++++++ drawable_resources/icon-background.svg | 3 ++- drawable_resources/icon-foreground.svg | 3 ++- drawable_resources/other/file-icon-black-24h.svg | 3 +-- drawable_resources/other/file-icon.svg | 3 +-- drawable_resources/other/file-password-request.svg | 3 +-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index 1c70ee675..9ad6f13a6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -20,6 +20,7 @@ package com.nextcloud.talk.controllers; +import android.annotation.SuppressLint; import android.content.pm.ActivityInfo; import android.os.Bundle; import android.os.Handler; @@ -265,6 +266,7 @@ public class AccountVerificationController extends BaseController { disposables.add(d); } + @SuppressLint("SetTextI18n") @Override public void onNext(UserEntity userEntity) { internalAccountId = userEntity.getId(); @@ -278,6 +280,7 @@ public class AccountVerificationController extends BaseController { } } + @SuppressLint("SetTextI18n") @Override public void onError(Throwable e) { progressText.setText(progressText.getText().toString() + @@ -305,6 +308,7 @@ public class AccountVerificationController extends BaseController { disposables.add(d); } + @SuppressLint("SetTextI18n") @Override public void onNext(UserProfileOverall userProfileOverall) { String displayName = null; @@ -329,6 +333,7 @@ public class AccountVerificationController extends BaseController { } } + @SuppressLint("SetTextI18n") @Override public void onError(Throwable e) { if (getActivity() != null) { @@ -351,6 +356,7 @@ public class AccountVerificationController extends BaseController { WorkManager.getInstance().enqueue(pushRegistrationWork); } + @SuppressLint("SetTextI18n") @Subscribe(threadMode = ThreadMode.BACKGROUND) public void onMessageEvent(EventStatus eventStatus) { if (eventStatus.getEventType().equals(EventStatus.EventType.PUSH_REGISTRATION)) { diff --git a/drawable_resources/icon-background.svg b/drawable_resources/icon-background.svg index 3ed4da872..b2618fccd 100644 --- a/drawable_resources/icon-background.svg +++ b/drawable_resources/icon-background.svg @@ -1,6 +1,7 @@ - + diff --git a/drawable_resources/icon-foreground.svg b/drawable_resources/icon-foreground.svg index d02f3012f..9f006881c 100644 --- a/drawable_resources/icon-foreground.svg +++ b/drawable_resources/icon-foreground.svg @@ -1,5 +1,6 @@ - + diff --git a/drawable_resources/other/file-icon-black-24h.svg b/drawable_resources/other/file-icon-black-24h.svg index 7a5d215b7..7b35dc82d 100644 --- a/drawable_resources/other/file-icon-black-24h.svg +++ b/drawable_resources/other/file-icon-black-24h.svg @@ -1,5 +1,4 @@ - - + diff --git a/drawable_resources/other/file-icon.svg b/drawable_resources/other/file-icon.svg index 7593a16fe..53f26f865 100644 --- a/drawable_resources/other/file-icon.svg +++ b/drawable_resources/other/file-icon.svg @@ -1,5 +1,4 @@ - - + diff --git a/drawable_resources/other/file-password-request.svg b/drawable_resources/other/file-password-request.svg index 529955ee3..917f9bb52 100644 --- a/drawable_resources/other/file-password-request.svg +++ b/drawable_resources/other/file-password-request.svg @@ -1,5 +1,4 @@ - - + From f80bc17515b930a9b2dad7553e1b5791909d83db Mon Sep 17 00:00:00 2001 From: drone Date: Wed, 10 Feb 2021 14:18:27 +0000 Subject: [PATCH 4/4] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 6279a4388..0f710c4d0 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 240 warnings + Lint Report: 3 errors and 239 warnings