Merge pull request #2152 from nextcloud/dependabot/gradle/com.google.android.exoplayer-exoplayer-2.18.0

Bump exoplayer from 2.17.1 to 2.18.0

app/build.gradle

@@ -273,7 +273,7 @@ dependencies {
     implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}"
 
     implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.0'
 
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'

app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt

@@ -34,6 +34,7 @@ import autodagger.AutoInjector
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.SimpleExoPlayer
+import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.nextcloud.talk.BuildConfig
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
@@ -100,15 +101,17 @@ class FullScreenMediaActivity : AppCompatActivity(), Player.Listener {
             binding.playerView.controllerShowTimeoutMs = 0
         }
 
-        binding.playerView.setControllerVisibilityListener { v ->
+        binding.playerView.setControllerVisibilityListener(
-            if (v != 0) {
+            StyledPlayerView.ControllerVisibilityListener { v ->
-                hideSystemUI()
+                if (v != 0) {
-                supportActionBar?.hide()
+                    hideSystemUI()
-            } else {
+                    supportActionBar?.hide()
-                showSystemUI()
+                } else {
-                supportActionBar?.show()
+                    showSystemUI()
+                    supportActionBar?.show()
+                }
             }
-        }
+        )
     }
 
     override fun onStart() {

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -1,24 +1,23 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Mario Danic
+ * @author Andy Scherzinger
+ * Copyright (C) 2021 Andy Scherzinger (infoi@andy-scherzinger.de)
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   @author Mario Danic
+ * This program is free software: you can redistribute it and/or modify
- *   @author Andy Scherzinger
+ * it under the terms of the GNU General Public License as published by
- *   Copyright (C) 2021 Andy Scherzinger (infoi@andy-scherzinger.de)
+ * the Free Software Foundation, either version 3 of the License, or
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.activities
 

app/src/main/java/com/nextcloud/talk/api/NcApi.java

@@ -1,26 +1,25 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Mario Danic
+ * @author Marcel Hibbe
+ * @author Tim Krüger
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * Copyright (C) 2021 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
  *
- *   @author Mario Danic
+ * This program is free software: you can redistribute it and/or modify
- *   @author Marcel Hibbe
+ * it under the terms of the GNU General Public License as published by
- *   @author Tim Krüger
+ * the Free Software Foundation, either version 3 of the License, or
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * at your option) any later version.
- *   Copyright (C) 2021 Marcel Hibbe <dev@mhibbe.de>
- *   Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.api;
 

app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt

@@ -133,11 +133,11 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver {
     //region private methods
     private fun initializeWebRtc() {
         try {
-            if (MagicWebRTCUtils.HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
+            if (MagicWebRTCUtils.HARDWARE_AEC_EXCLUDE_SET.contains(Build.MODEL)) {
                 WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true)
             }
 
-            if (!MagicWebRTCUtils.OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
+            if (!MagicWebRTCUtils.OPEN_SL_ES_INCLUDE_SET.contains(Build.MODEL)) {
                 WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true)
             }
 

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

@@ -1,7 +1,9 @@
 /*
  * Nextcloud Talk application
  *
+ * @author Andy Scherzinger
  * @author Mario Danic
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
  * Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,6 +22,8 @@
 
 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;
@@ -45,6 +49,8 @@ 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";
     public static final String DAV_PATH = "/remote.php/dav/files/";
@@ -112,12 +118,8 @@ public class DavUtils {
             reflectionMap.put(NCPermission.NAME, new NCPermission.Factory());
 
             factories.set(propertyRegistry, reflectionMap);
-        } catch (NoSuchFieldException e) {
+        } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
+            Log.w(TAG, "Error registering custom factories", e);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
         }
-
     }
-
 }

app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Mario Danic
+ * @author Mario Danic
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.controllers
 

app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   @author Mario Danic
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.dagger.modules;
 

app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   @author Mario Danic
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.dagger.modules;
 

app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   @author Mario Danic
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.dagger.modules;
 

app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Tim Krüger
+ * Copyright (C) 2021-2022 Tim Krüger <t@timkrueger.me>
  *
- *   @author Tim Krüger
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2021-2022 Tim Krüger <t@timkrueger.me>
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.hovercard
 

app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Tim Krüger
+ * Copyright (C) 2021-2022 Tim Krüger <t@timkrueger.me>
  *
- *   @author Tim Krüger
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2021-2022 Tim Krüger <t@timkrueger.me>
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.hovercard
 

app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Tim Krüger
+ * Copyright (C) 2021-2022 Tim Krüger <t@timkrueger.me>
  *
- *   @author Tim Krüger
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2021-2022 Tim Krüger <t@timkrueger.me>
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.hovercard
 

app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Marcel Hibbe
+ * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
  *
- *   @author Marcel Hibbe
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.reactions
 

app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt

@@ -1,21 +1,21 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Marcel Hibbe
+ * @author Marcel Hibbe
- *   Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.reactions
 

app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Tim Krüger
+ * Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
  *
- *   @author Tim Krüger
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.status
 

app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Tim Krüger
+ * @author Tim Krüger
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
+ * Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.status
 

app/src/main/java/com/nextcloud/talk/models/json/statuses/StatusesOverall.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Tim Krüger
+ * @author Tim Krüger
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
+ * Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.statuses
 

app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt

@@ -1,21 +1,21 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Marcel Hibbe
+ * @author Marcel Hibbe
- *   Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.unifiedsearch
 

app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt

@@ -1,21 +1,21 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Marcel Hibbe
+ * @author Marcel Hibbe
- *   Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.unifiedsearch
 

app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Mario Danic
+ * @author Mario Danic
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
+ * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.userprofile
 

app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Tobias Kaminsky
+ * @author Tobias Kaminsky
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2021 Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
+ * Copyright (C) 2021 Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.userprofile
 

app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Tobias Kaminsky
+ * @author Tobias Kaminsky
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2021 Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
+ * Copyright (C) 2021 Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.userprofile
 

app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt

@@ -1,23 +1,23 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Mario Danic
+ * @author Mario Danic
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.models.json.userprofile
 

app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Tim Krüger
+ * Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
  *
- *   @author Tim Krüger
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2021 Tim Krüger <t@timkrueger.me>
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.ui.bottom.sheet
 

app/src/main/java/com/nextcloud/talk/utils/DateConstants.kt

@@ -1,21 +1,21 @@
 /*
- *   Nextcloud Talk application
+ * Nextcloud Talk application
  *
- *   @author Andy Scherzinger
+ * @author Andy Scherzinger
- *   Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *   at your option) any later version.
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.nextcloud.talk.utils

app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java

@@ -1,22 +1,21 @@
 /*
+ * Nextcloud Talk application
  *
- *   Nextcloud Talk application
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
- *   @author Mario Danic
+ * This program is free software: you can redistribute it and/or modify
- *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is free software: you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful,
- *   it under the terms of the GNU General Public License as published by
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   the Free Software Foundation, either version 3 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   at your option) any later version.
+ * GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
+ * You should have received a copy of the GNU General Public License
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.nextcloud.talk.utils.database.user;
 

app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java

@@ -44,7 +44,7 @@ public class MagicWebRTCUtils {
     /* AEC blacklist and SL_ES_WHITELIST are borrowed from Signal
        https://github.com/WhisperSystems/Signal-Android/blob/551470123d006b76a68d705d131bb12513a5e683/src/org/thoughtcrime/securesms/ApplicationContext.java
     */
-    public static Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
+    public static Set<String> HARDWARE_AEC_EXCLUDE_SET = new HashSet<String>() {{
         add("D6503"); // Sony Xperia Z2 D6503
         add("ONE A2005"); // OnePlus 2
         add("MotoG3"); // Moto G (3rd Generation)
@@ -69,12 +69,12 @@ public class MagicWebRTCUtils {
         add("E5823"); // Sony Z5 Compact
     }};
 
-    public static Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
+    public static Set<String> OPEN_SL_ES_INCLUDE_SET = new HashSet<String>() {{
         add("Pixel");
         add("Pixel XL");
     }};
 
-    private static Set<String> HARDWARE_ACCELERATION_DEVICE_BLACKLIST = new HashSet<String>() {{
+    private static final Set<String> HARDWARE_ACCELERATION_DEVICE_EXCLUDE_SET = new HashSet<String>() {{
         add("GT-I9100"); // Samsung Galaxy S2
         add("GT-N8013"); // Samsung Galaxy Note 10.1
         add("SM-G930F"); // Samsung Galaxy S7
@@ -86,14 +86,14 @@ public class MagicWebRTCUtils {
         add("XT1097"); // Motorola Moto X (2nd Gen)
     }};
 
-    private static Set<String> HARDWARE_ACCELERATION_VENDOR_BLACKLIST = new HashSet<String>() {{
+    private static final Set<String> HARDWARE_ACCELERATION_VENDOR_EXCLUDE_SET = new HashSet<String>() {{
         add("samsung");
     }};
 
 
     public static boolean shouldEnableVideoHardwareAcceleration() {
-        return (!HARDWARE_ACCELERATION_VENDOR_BLACKLIST.contains(Build.MANUFACTURER.toLowerCase(Locale.ROOT))
+        return (!HARDWARE_ACCELERATION_VENDOR_EXCLUDE_SET.contains(Build.MANUFACTURER.toLowerCase(Locale.ROOT))
-                && !HARDWARE_ACCELERATION_DEVICE_BLACKLIST.contains(Build.MODEL.toUpperCase(Locale.ROOT)));
+                && !HARDWARE_ACCELERATION_DEVICE_EXCLUDE_SET.contains(Build.MODEL.toUpperCase(Locale.ROOT)));
     }
 
     public static String preferCodec(String sdpDescription, String codec, boolean isAudio) {
@@ -105,7 +105,7 @@ public class MagicWebRTCUtils {
         }
         // A list with all the payload types with name |codec|. The payload types are integers in the
         // range 96-127, but they are stored as strings here.
-        final List<String> codecPayloadTypes = new ArrayList<String>();
+        final List<String> codecPayloadTypes = new ArrayList<>();
         // a=rtpmap:<payload type> <encoding name>/<clock rate> [/<encoding parameters>]
         final Pattern codecPattern = Pattern.compile("^a=rtpmap:(\\d+) " + codec + "(/\\d+)+[\r]?$");
         for (int i = 0; i < lines.length; ++i) {
@@ -150,11 +150,11 @@ public class MagicWebRTCUtils {
         }
         final List<String> header = origLineParts.subList(0, 3);
         final List<String> unpreferredPayloadTypes =
-                new ArrayList<String>(origLineParts.subList(3, origLineParts.size()));
+                new ArrayList<>(origLineParts.subList(3, origLineParts.size()));
         unpreferredPayloadTypes.removeAll(preferredPayloadTypes);
         // Reconstruct the line with |preferredPayloadTypes| moved to the beginning of the payload
         // types.
-        final List<String> newLineParts = new ArrayList<String>();
+        final List<String> newLineParts = new ArrayList<>();
         newLineParts.addAll(header);
         newLineParts.addAll(preferredPayloadTypes);
         newLineParts.addAll(unpreferredPayloadTypes);
@@ -162,7 +162,9 @@ public class MagicWebRTCUtils {
     }
 
     private static String joinString(
-            Iterable<? extends CharSequence> s, String delimiter, boolean delimiterAtEnd) {
+            Iterable<? extends CharSequence> s,
+            String delimiter,
+            boolean delimiterAtEnd) {
         Iterator<? extends CharSequence> iter = s.iterator();
         if (!iter.hasNext()) {
             return "";
@@ -176,5 +178,4 @@ public class MagicWebRTCUtils {
         }
         return buffer.toString();
     }
-
 }

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-173
+167