Merge pull request #3745 from nextcloud/chore/noid/spdxHeader3

Add SPDX header

.devcontainer/Dockerfile.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: GPL-3.0-or-later

.devcontainer/README.md

@@ -1,3 +1,7 @@
+<!--
+ ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 # Instructions
 
 1. Start a DevContainer either on GitHub Codespaces or locally in VSCode

.devcontainer/devcontainer.env.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: GPL-3.0-or-later

.devcontainer/devcontainer.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: GPL-3.0-or-later

.github/workflows/assembleFlavors.yml

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 name: "Assemble"
 
 on:

.github/workflows/check.yml

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 name: Check
 
 on:

.github/workflows/command-rebase.yml

@@ -3,6 +3,9 @@
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 name: Rebase command
 
 on:

.github/workflows/fixup.yml

@@ -3,6 +3,9 @@
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 name: Block fixup and squash commits
 
 on:

.github/workflows/qa.yml

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2023 Andy Scherzinger <[email protected]>
+# SPDX-License-Identifier: MIT
 name: "QA"
 
 on:

.github/workflows/unit-tests.yml

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 name: Unit tests
 
 on:

.tx/config.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: GPL-3.0-or-later

app/lint.xml

@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~ 
+  ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger <[email protected]>
+  ~ SPDX-FileCopyrightText: 2023 Marcel Hibbe <[email protected]>
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <[email protected]>
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <[email protected]>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <lint>
     <issue id="UnusedAttribute">
         <ignore regexp="importantForAutofill"/>

app/src/main/java/com/nextcloud/talk/models/domain/converters/DomainEnumNotificationLevelConverter.kt

@@ -25,21 +25,28 @@ import com.nextcloud.talk.models.domain.NotificationLevel
 class DomainEnumNotificationLevelConverter : IntBasedTypeConverter<NotificationLevel>() {
     override fun getFromInt(i: Int): NotificationLevel {
         return when (i) {
-            0 -> NotificationLevel.DEFAULT
-            1 -> NotificationLevel.ALWAYS
-            2 -> NotificationLevel.MENTION
-            3 -> NotificationLevel.NEVER
+            DEFAULT -> NotificationLevel.DEFAULT
+            ALWAYS -> NotificationLevel.ALWAYS
+            MENTION -> NotificationLevel.MENTION
+            NEVER -> NotificationLevel.NEVER
             else -> NotificationLevel.DEFAULT
         }
     }
 
     override fun convertToInt(`object`: NotificationLevel): Int {
         return when (`object`) {
-            NotificationLevel.DEFAULT -> 0
-            NotificationLevel.ALWAYS -> 1
-            NotificationLevel.MENTION -> 2
-            NotificationLevel.NEVER -> 3
-            else -> 0
+            NotificationLevel.DEFAULT -> DEFAULT
+            NotificationLevel.ALWAYS -> ALWAYS
+            NotificationLevel.MENTION -> MENTION
+            NotificationLevel.NEVER -> NEVER
+            else -> DEFAULT
         }
     }
+
+    companion object {
+        private const val DEFAULT: Int = 0
+        private const val ALWAYS: Int = 1
+        private const val MENTION: Int = 2
+        private const val NEVER: Int = 3
+    }
 }

app/src/main/res/drawable-night/ic_cellphone.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Nextcloud Notes - Android Client
+  ~ Nextcloud Talk - Android Client
   ~
   ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0

app/src/main/res/drawable-night/ic_chevron_right.xml

@@ -1,18 +1,8 @@
 <!--
-    @author Google LLC
-    Copyright (C) 2023 Google LLC
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"

app/src/main/res/drawable-night/ic_circular_document.xml

@@ -1,35 +1,24 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <[email protected]>
-  ~
-  ~ 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.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2021-2024 Andy Scherzinger <[email protected]>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2C2C"
-        android:fillType="nonZero"
-        android:pathData="M12,0C5.4168,0 0,5.4168 0,12C0,18.5832 5.4168,24 12,24C18.5832,24 24,18.5832 24,12C24,5.4168 18.5832,0 12,0Z" />
-    <path
-        android:fillColor="#ffffff"
-        android:fillType="nonZero"
-        android:pathData="M7.4167,6C7.1833,6 7,6.1833 7,6.4167L7,17.25C7,17.4833 7.1833,17.6667 7.4167,17.6667L16.5833,17.6667C16.8167,17.6667 17,17.4833 17,17.25L17,8.5L14.5,6L7.4167,6ZM8.6667,7.6667L13.6667,7.6667L13.6667,8.5L8.6667,8.5L8.6667,7.6667ZM8.6667,10.1667L12.8333,10.1667L12.8333,11L8.6667,11L8.6667,10.1667ZM8.6667,12.6667L15.3333,12.6667L15.3333,13.5L8.6667,13.5L8.6667,12.6667ZM8.6667,15.1667L12,15.1667L12,16L8.6667,16L8.6667,15.1667Z" />
+android:width="24dp"
+android:height="24dp"
+android:autoMirrored="true"
+android:viewportWidth="24"
+android:viewportHeight="24">
+
+<path
+    android:fillColor="#2C2C2C"
+    android:fillType="nonZero"
+    android:pathData="M12,0C5.417,0 0,5.417 0,12C0,18.583 5.417,24 12,24C18.583,24 24,18.583 24,12C24,5.417 18.583,0 12,0Z" />
+
+<path
+    android:fillColor="#ffffff"
+    android:fillType="nonZero"
+    android:pathData="M16.661,6.007L7.339,6.007C6.606,6.007 6.007,6.606 6.007,7.339L6.007,16.661C6.007,17.394 6.606,17.993 7.339,17.993L16.661,17.993C17.394,17.993 17.993,17.394 17.993,16.661L17.993,7.339C17.993,6.606 17.394,6.007 16.661,6.007ZM13.332,15.329L8.671,15.329L8.671,13.998L13.332,13.998L13.332,15.329ZM15.329,12.666L8.671,12.666L8.671,11.334L15.329,11.334L15.329,12.666ZM15.329,10.002L8.671,10.002L8.671,8.671L15.329,8.671L15.329,10.002Z" />
 </vector>

app/src/main/res/drawable-night/ic_circular_group.xml

@@ -1,23 +1,9 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <[email protected]>
-  ~
-  ~ 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.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <[email protected]>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

app/src/main/res/drawable-night/ic_circular_link.xml

@@ -1,23 +1,10 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <[email protected]>
-  ~
-  ~ 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.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <[email protected]>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

app/src/main/res/drawable-night/ic_circular_location.xml

@@ -1,23 +1,10 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <[email protected]>
-  ~
-  ~ 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.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <[email protected]>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

app/src/main/res/drawable-night/ic_circular_lock.xml

@@ -1,23 +1,10 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <[email protected]>
-  ~
-  ~ 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.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <[email protected]>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

app/src/main/res/drawable-night/ic_circular_mail.xml

@@ -1,23 +1,10 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <[email protected]>
-  ~
-  ~ 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.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <[email protected]>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

app/src/main/res/drawable-night/ic_close_search.xml

@@ -1,23 +1,15 @@
 <!--
-    @author Google LLC
-    Copyright (C) 2018 Google LLC
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
 </vector>

app/src/main/res/drawable-night/ic_contacts.xml

@@ -1,3 +1,9 @@
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
     android:height="16dp"