From ffb1930161bc656edd3352e9f0203d40dff57929 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:12:11 +0000 Subject: [PATCH 1/6] Bump exoplayer from 2.17.1 to 2.18.0 Bumps [exoplayer](https://github.com/google/ExoPlayer) from 2.17.1 to 2.18.0. - [Release notes](https://github.com/google/ExoPlayer/releases) - [Changelog](https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md) - [Commits](https://github.com/google/ExoPlayer/compare/r2.17.1...r2.18.0) --- updated-dependencies: - dependency-name: com.google.android.exoplayer:exoplayer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d92b4cfa1..5e94bb617 100644 --- a/app/build.gradle +++ b/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' From 61ec38dd5e0d542aae1d7c210eefe9ebd33c70f8 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 18 Jun 2022 16:25:27 +0200 Subject: [PATCH 2/6] replace deprecated listener due to update to exoplayer 2.18.0 Signed-off-by: Andy Scherzinger --- .../activities/FullScreenMediaActivity.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt index 989866e2d..cfadded62 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt +++ b/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 -> - if (v != 0) { - hideSystemUI() - supportActionBar?.hide() - } else { - showSystemUI() - supportActionBar?.show() + binding.playerView.setControllerVisibilityListener( + StyledPlayerView.ControllerVisibilityListener { v -> + if (v != 0) { + hideSystemUI() + supportActionBar?.hide() + } else { + showSystemUI() + supportActionBar?.show() + } } - } + ) } override fun onStart() { From 49792ecf1e21347303a017a5e02d3a9eea0e4e74 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 18 Jun 2022 16:29:57 +0200 Subject: [PATCH 3/6] rename blacklist/whitelist variables to include/exclude sets to reflect their collection type Signed-off-by: Andy Scherzinger --- .../application/NextcloudTalkApplication.kt | 4 ++-- .../talk/webrtc/MagicWebRTCUtils.java | 23 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) 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 7b3336d9c..ea3d97237 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt +++ b/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) } diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java index 68a8a3c74..b669bb184 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java +++ b/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 HARDWARE_AEC_BLACKLIST = new HashSet() {{ + public static Set HARDWARE_AEC_EXCLUDE_SET = new HashSet() {{ 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 OPEN_SL_ES_WHITELIST = new HashSet() {{ + public static Set OPEN_SL_ES_INCLUDE_SET = new HashSet() {{ add("Pixel"); add("Pixel XL"); }}; - private static Set HARDWARE_ACCELERATION_DEVICE_BLACKLIST = new HashSet() {{ + private static final Set HARDWARE_ACCELERATION_DEVICE_EXCLUDE_SET = new HashSet() {{ 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 HARDWARE_ACCELERATION_VENDOR_BLACKLIST = new HashSet() {{ + private static final Set HARDWARE_ACCELERATION_VENDOR_EXCLUDE_SET = new HashSet() {{ add("samsung"); }}; public static boolean shouldEnableVideoHardwareAcceleration() { - return (!HARDWARE_ACCELERATION_VENDOR_BLACKLIST.contains(Build.MANUFACTURER.toLowerCase(Locale.ROOT)) - && !HARDWARE_ACCELERATION_DEVICE_BLACKLIST.contains(Build.MODEL.toUpperCase(Locale.ROOT))); + return (!HARDWARE_ACCELERATION_VENDOR_EXCLUDE_SET.contains(Build.MANUFACTURER.toLowerCase(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 codecPayloadTypes = new ArrayList(); + final List codecPayloadTypes = new ArrayList<>(); // a=rtpmap: / [/] 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 header = origLineParts.subList(0, 3); final List unpreferredPayloadTypes = - new ArrayList(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 newLineParts = new ArrayList(); + final List newLineParts = new ArrayList<>(); newLineParts.addAll(header); newLineParts.addAll(preferredPayloadTypes); newLineParts.addAll(unpreferredPayloadTypes); @@ -162,7 +162,9 @@ public class MagicWebRTCUtils { } private static String joinString( - Iterable s, String delimiter, boolean delimiterAtEnd) { + Iterable s, + String delimiter, + boolean delimiterAtEnd) { Iterator iter = s.iterator(); if (!iter.hasNext()) { return ""; @@ -176,5 +178,4 @@ public class MagicWebRTCUtils { } return buffer.toString(); } - } From 0b2b0cca51db1f2a4510ac6582a01930b8468185 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 18 Jun 2022 16:36:02 +0200 Subject: [PATCH 4/6] Use proper Android logger Signed-off-by: Andy Scherzinger --- .../components/filebrowser/webdav/DavUtils.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java index 07067a9a3..2b96ee1db 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java +++ b/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 * Copyright (C) 2017-2019 Mario Danic * * 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) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + } catch (NoSuchFieldException | IllegalAccessException e) { + Log.w(TAG, "Error registering custom factories", e); } - } - } From 25541198fb0469e8abbf41307853da5c1987f410 Mon Sep 17 00:00:00 2001 From: drone Date: Sat, 18 Jun 2022 14:41:27 +0000 Subject: [PATCH 5/6] Drone: update FindBugs results to reflect reduced error/warning count [skip ci] Signed-off-by: drone --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index 7b27b2519..2efea5198 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -173 \ No newline at end of file +167 \ No newline at end of file From 205d00d443bc33e660de13a63fcefba829f94f75 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 18 Jun 2022 16:42:35 +0200 Subject: [PATCH 6/6] harmonize license header in java/kt files Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/activities/MainActivity.kt | 31 ++++++++-------- .../java/com/nextcloud/talk/api/NcApi.java | 35 +++++++++---------- .../controllers/WebViewLoginController.kt | 30 ++++++++-------- .../talk/dagger/modules/BusModule.java | 27 +++++++------- .../talk/dagger/modules/ContextModule.java | 27 +++++++------- .../talk/dagger/modules/RestModule.java | 27 +++++++------- .../talk/models/json/hovercard/HoverCard.kt | 27 +++++++------- .../models/json/hovercard/HoverCardAction.kt | 27 +++++++------- .../models/json/hovercard/HoverCardOverall.kt | 27 +++++++------- .../models/json/reactions/ReactionVoter.kt | 27 +++++++------- .../models/json/reactions/ReactionsOverall.kt | 26 +++++++------- .../talk/models/json/status/Status.kt | 27 +++++++------- .../talk/models/json/status/StatusOverall.kt | 30 ++++++++-------- .../models/json/statuses/StatusesOverall.kt | 30 ++++++++-------- .../json/unifiedsearch/UnifiedSearchOCS.kt | 26 +++++++------- .../unifiedsearch/UnifiedSearchOverall.kt | 26 +++++++------- .../json/userprofile/UserProfileData.kt | 30 ++++++++-------- .../json/userprofile/UserProfileFieldsOCS.kt | 30 ++++++++-------- .../userprofile/UserProfileFieldsOverall.kt | 30 ++++++++-------- .../json/userprofile/UserProfileOverall.kt | 30 ++++++++-------- .../ui/bottom/sheet/ProfileBottomSheet.kt | 27 +++++++------- .../com/nextcloud/talk/utils/DateConstants.kt | 26 +++++++------- .../talk/utils/database/user/UserUtils.java | 27 +++++++------- 23 files changed, 319 insertions(+), 331 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index cb60b731c..7c59c31d3 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/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 - * @author Andy Scherzinger - * Copyright (C) 2021 Andy Scherzinger (infoi@andy-scherzinger.de) - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.activities diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java index f2d96d83d..6f2b65e3d 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java +++ b/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 + * Copyright (C) 2021 Tim Krüger * - * @author Mario Danic - * @author Marcel Hibbe - * @author Tim Krüger - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) - * Copyright (C) 2021 Marcel Hibbe - * Copyright (C) 2021 Tim Krüger + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.api; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt index b4255ac94..af6ed0adc 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt @@ -1,23 +1,23 @@ /* - * Nextcloud Talk application + * Nextcloud Talk application * - * @author Mario Danic - * @author Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * @author Mario Danic + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.controllers diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java index a8817229a..15691c5fe 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java +++ b/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 - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.dagger.modules; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java index 56663c057..0e3d48c0c 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java +++ b/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 - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.dagger.modules; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java index 467ff1876..f6c63da64 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java +++ b/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 - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.dagger.modules; diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt index cc349a599..05421b749 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt +++ b/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 * - * @author Tim Krüger - * Copyright (C) 2021-2022 Tim Krüger + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.hovercard diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt index e1af7ed92..89037b21f 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt +++ b/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 * - * @author Tim Krüger - * Copyright (C) 2021-2022 Tim Krüger + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.hovercard diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt index ed69c02a7..3e073d2fd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt +++ b/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 * - * @author Tim Krüger - * Copyright (C) 2021-2022 Tim Krüger + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.hovercard diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt index 57357729d..8ae56e5b6 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt +++ b/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 * - * @author Marcel Hibbe - * Copyright (C) 2022 Marcel Hibbe + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.reactions diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt index 6a9d88fcd..3a2e629e5 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt +++ b/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 - * Copyright (C) 2022 Marcel Hibbe + * @author Marcel Hibbe + * Copyright (C) 2022 Marcel Hibbe * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.reactions diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt index ae2c082bb..d31beb7c5 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt +++ b/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 * - * @author Tim Krüger - * Copyright (C) 2021 Tim Krüger + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.status diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt index a9b762026..b3e68a321 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt +++ b/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 Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2021 Tim Krüger + * @author Tim Krüger + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2021 Tim Krüger * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.status diff --git a/app/src/main/java/com/nextcloud/talk/models/json/statuses/StatusesOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/statuses/StatusesOverall.kt index 061ca3686..0a65abac1 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/statuses/StatusesOverall.kt +++ b/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 Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2021 Tim Krüger + * @author Tim Krüger + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2021 Tim Krüger * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.statuses diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt index ba6e7a89a..fd21d9fa5 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt +++ b/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 - * Copyright (C) 2022 Marcel Hibbe + * @author Marcel Hibbe + * Copyright (C) 2022 Marcel Hibbe * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.unifiedsearch diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt index d1db94f5e..0fb7cce07 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt +++ b/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 - * Copyright (C) 2022 Marcel Hibbe + * @author Marcel Hibbe + * Copyright (C) 2022 Marcel Hibbe * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.unifiedsearch diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt index d4ab48b2a..e405c151d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt +++ b/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 Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2017 Mario Danic + * @author Mario Danic + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2017 Mario Danic * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.userprofile diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt index 3dcab0e67..db512661a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt +++ b/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 Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2021 Tobias Kaminsky + * @author Tobias Kaminsky + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2021 Tobias Kaminsky * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.userprofile diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt index 14c5457a1..466704928 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt +++ b/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 Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2021 Tobias Kaminsky + * @author Tobias Kaminsky + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2021 Tobias Kaminsky * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.userprofile diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt index be0f1aac2..95a89fd02 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt +++ b/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 Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * @author Mario Danic + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.models.json.userprofile diff --git a/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt b/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt index 975b5e3f7..d05fc880d 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt +++ b/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 * - * @author Tim Krüger - * Copyright (C) 2021 Tim Krüger + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.ui.bottom.sheet diff --git a/app/src/main/java/com/nextcloud/talk/utils/DateConstants.kt b/app/src/main/java/com/nextcloud/talk/utils/DateConstants.kt index 5632720be..bc1e7b1ef 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DateConstants.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DateConstants.kt @@ -1,21 +1,21 @@ /* - * Nextcloud Talk application + * Nextcloud Talk application * - * @author Andy Scherzinger - * Copyright (C) 2022 Andy Scherzinger + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger * - * 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 - * 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 + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.utils 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 8ee5a347c..4dad177fb 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 @@ -1,22 +1,21 @@ /* + * Nextcloud Talk application * - * Nextcloud Talk application + * @author Mario Danic + * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) * - * @author Mario Danic - * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com) + * 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 + * 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 - * 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 distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.nextcloud.talk.utils.database.user;