Update copyright

MAILAND-2696
2022-02-28 16:15:59 +01:00 · 2022-02-28 16:15:59 +01:00 · 30e5087084
parent c5f5555a70
commit 30e5087084
1677 changed files with 11654 additions and 11431 deletions
--- a/.idea/copyright/ProtonMail.xml
+++ b/.idea/copyright/ProtonMail.xml
@ -1,6 +1,7 @@
 <component name="CopyrightManager">
  <copyright>
-    <option name="notice" value="Copyright (c) 2022 Proton Technologies AG&#10;&#10;This file is part of ProtonMail.&#10;&#10;ProtonMail is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;ProtonMail is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with ProtonMail. If not, see https://www.gnu.org/licenses/." />
+    <option name="allowReplaceRegexp" value="Copyright" />
+    <option name="notice" value="Copyright (c) 2022 Proton AG&#10;&#10;This file is part of Proton Mail.&#10;&#10;Proton Mail is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;Proton Mail is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with Proton Mail. If not, see https://www.gnu.org/licenses/." />
    <option name="myName" value="Proton Mail" />
  </copyright>
 </component>
--- a/.idea/kotlinScripting.xml
+++ b/.idea/kotlinScripting.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
+Copyright (c) 2022 Proton AG

 This file is part of Proton Mail.

--- a/.idea/scopes/Gradle_files.xml
+++ b/.idea/scopes/Gradle_files.xml
@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2020 Proton Technologies AG
+Copyright (c) 2022 Proton AG

 This file is part of Proton Mail.

--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/experimental.properties
+++ b/app/experimental.properties
@ -0,0 +1,19 @@
+#
+# Copyright (c) 2022 Proton AG
+#
+# This file is part of Proton Mail.
+#
+# Proton Mail 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.
+#
+# Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+#
+
--- a/app/old.build.gradle
+++ b/app/old.build.gradle
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/alpha/java/ch.protonmail.android/di/ConfigurableParametersModule.kt
+++ b/app/src/alpha/java/ch.protonmail.android/di/ConfigurableParametersModule.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/alpha/res/values/strings.xml
+++ b/app/src/alpha/res/values/strings.xml
@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
  ~
  ~ This file is part of Proton Mail.
  ~
--- a/app/src/androidTest/java/ch/protonmail/android/ExampleCustomInjectionTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/ExampleCustomInjectionTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/HiltCustomTestRunner.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/HiltCustomTestRunner.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/TestConfigurableParametersModule.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/TestConfigurableParametersModule.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/activities/NotificationSettingsViewModelTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/activities/NotificationSettingsViewModelTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/api/models/ContactEncryptedDataMatcher.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/api/models/ContactEncryptedDataMatcher.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/api/models/room/LiveDataUtil.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/api/models/room/LiveDataUtil.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/ContactDaoTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/ContactDaoTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/FullContactDetailsConverterTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/FullContactDetailsConverterTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/FullContactsDetailsMatcher.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/FullContactsDetailsMatcher.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/compose/presentation/ui/SetMessageExpirationActivityTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/compose/presentation/ui/SetMessageExpirationActivityTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/compose/presentation/ui/SetMessagePasswordActivityTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/compose/presentation/ui/SetMessagePasswordActivityTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/crypto/AddressCryptoAndroidTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/crypto/AddressCryptoAndroidTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/crypto/CryptoTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/crypto/CryptoTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/details/presentation/view/CollapsedMessageViewsTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/details/presentation/view/CollapsedMessageViewsTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/labels/data/mapper/LabelOrFolderWithChildrenMapperBenchmarks.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/labels/data/mapper/LabelOrFolderWithChildrenMapperBenchmarks.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/mailbox/data/local/UnreadCounterDaoTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/mailbox/data/local/UnreadCounterDaoTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/settings/pin/PinFragmentViewModelTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/settings/pin/PinFragmentViewModelTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/ui/layout/MoreItemsLinearLayoutTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/ui/layout/MoreItemsLinearLayoutTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/ui/view/DaysAndHoursPickerViewTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/ui/view/DaysAndHoursPickerViewTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/ui/view/MultiLineLabelChipGroupViewTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/ui/view/MultiLineLabelChipGroupViewTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/ui/view/SingleLineCollapsedLabelGroupViewTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/ui/view/SingleLineCollapsedLabelGroupViewTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/ui/view/SingleLineLabelChipGroupViewTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/ui/view/SingleLineLabelChipGroupViewTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/util/HiltViewTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/util/HiltViewTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/util/HiltViewTestActivity.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/util/HiltViewTestActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/util/ViewTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/util/ViewTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/util/viewMatchers.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/util/viewMatchers.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/androidTest/java/ch/protonmail/android/views/PmWebViewClientTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/views/PmWebViewClientTest.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2020 Proton Technologies AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/beta/java/ch.protonmail.android/di/ConfigurableParametersModule.kt
+++ b/app/src/beta/java/ch.protonmail.android/di/ConfigurableParametersModule.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/beta/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/beta/res/drawable/ic_launcher_foreground.xml
@ -1,20 +1,20 @@
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
--- a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
--- a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
--- a/app/src/beta/res/values/colors.xml
+++ b/app/src/beta/res/values/colors.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <resources>

--- a/app/src/beta/res/values/ic_launcher_background.xml
+++ b/app/src/beta/res/values/ic_launcher_background.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <resources>
    <color name="ic_launcher_background">@color/icon_background</color>
--- a/app/src/beta/res/values/notif.xml
+++ b/app/src/beta/res/values/notif.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <resources>
    <string name="action_notification" translatable="false">ch.protonmail.android.beta</string>
--- a/app/src/beta/res/values/strings.xml
+++ b/app/src/beta/res/values/strings.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <resources>
    <string name="app_version_code_login" translatable="false">Android Beta v.%1$s (%2$d)</string>
--- a/app/src/beta/res/xml-v25/shortcuts.xml
+++ b/app/src/beta/res/xml-v25/shortcuts.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2020 Proton Technologies AG
-
-This file is part of ProtonMail.
-
-ProtonMail 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.
-
-ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
  -->
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
    <shortcut
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
  ~
  ~ This file is part of Proton Mail.
  ~
--- a/app/src/main/java/androidx/core/app/ProtonJobIntentService.java
+++ b/app/src/main/java/androidx/core/app/ProtonJobIntentService.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/Doc.kt
+++ b/app/src/main/java/ch/protonmail/android/Doc.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/ViewTestActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/ViewTestActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/ActivityResultContracts.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/ActivityResultContracts.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/AddAttachmentsActivity.java
+++ b/app/src/main/java/ch/protonmail/android/activities/AddAttachmentsActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/BaseActivity.java
+++ b/app/src/main/java/ch/protonmail/android/activities/BaseActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/BaseConnectivityActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/BaseConnectivityActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/BaseContactsActivity.java
+++ b/app/src/main/java/ch/protonmail/android/activities/BaseContactsActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/BaseStoragePermissionActivity.java
+++ b/app/src/main/java/ch/protonmail/android/activities/BaseStoragePermissionActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/DefaultAddressActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/DefaultAddressActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/EditSettingsItemActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/EditSettingsItemActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/SearchActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/SearchActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/SettingsActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/SettingsActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/composeMessage/ComposeMessageActivity.java
+++ b/app/src/main/java/ch/protonmail/android/activities/composeMessage/ComposeMessageActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/composeMessage/MessageBuilderData.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/composeMessage/MessageBuilderData.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/composeMessage/SaveMassageTask.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/composeMessage/SaveMassageTask.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/composeMessage/UserAction.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/composeMessage/UserAction.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/contactDetails/ExtractFullContactDetailsTask.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/contactDetails/ExtractFullContactDetailsTask.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/dialogs/AbstractDialogFragment.java
+++ b/app/src/main/java/ch/protonmail/android/activities/dialogs/AbstractDialogFragment.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/dialogs/QuickSnoozeDialogFragment.java
+++ b/app/src/main/java/ch/protonmail/android/activities/dialogs/QuickSnoozeDialogFragment.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/fragments/BaseFragment.java
+++ b/app/src/main/java/ch/protonmail/android/activities/fragments/BaseFragment.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/fragments/DatePickerFragment.java
+++ b/app/src/main/java/ch/protonmail/android/activities/fragments/DatePickerFragment.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/IntentExtrasData.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/IntentExtrasData.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessageDetailsAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessageDetailsAdapter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessagePrinter.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessagePrinter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessageRenderer.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessageRenderer.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessageViewHeadersActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/MessageViewHeadersActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/RegisterReloadTask.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/RegisterReloadTask.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/attachments/CheckAttachmentTask.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/attachments/CheckAttachmentTask.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/attachments/MessageDetailsAttachmentListAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/attachments/MessageDetailsAttachmentListAdapter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/body/MessageBodyScaleListener.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/body/MessageBodyScaleListener.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/body/MessageBodyTouchListener.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/body/MessageBodyTouchListener.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/details/RecipientContextMenuFactory.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/details/RecipientContextMenuFactory.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/repository/MessageDetailsRepository.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/repository/MessageDetailsRepository.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/settings/BaseSettingsActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/settings/BaseSettingsActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/settings/NotificationSettingsActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/settings/NotificationSettingsActivity.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/settings/NotificationSettingsViewModel.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/settings/NotificationSettingsViewModel.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/activities/settings/SettingsEnum.kt
+++ b/app/src/main/java/ch/protonmail/android/activities/settings/SettingsEnum.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/AttachmentListAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/AttachmentListAdapter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/CountriesAdapter.java
+++ b/app/src/main/java/ch/protonmail/android/adapters/CountriesAdapter.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/LabelColorsAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/LabelColorsAdapter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/LabelsDialogAdapter.java
+++ b/app/src/main/java/ch/protonmail/android/adapters/LabelsDialogAdapter.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/QuickSnoozeOptionAdapter.java
+++ b/app/src/main/java/ch/protonmail/android/adapters/QuickSnoozeOptionAdapter.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/SettingsAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/SettingsAdapter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/SimpleCountriesAdapter.java
+++ b/app/src/main/java/ch/protonmail/android/adapters/SimpleCountriesAdapter.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/SimpleMessageCursorAdapter.java
+++ b/app/src/main/java/ch/protonmail/android/adapters/SimpleMessageCursorAdapter.java
@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2020 Proton Technologies AG
- * 
- * This file is part of ProtonMail.
- * 
- * ProtonMail 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.
- * 
- * ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
- */
--- a/app/src/main/java/ch/protonmail/android/adapters/messages/MailboxItemViewHolder.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/messages/MailboxItemViewHolder.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/messages/MailboxRecyclerViewAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/messages/MailboxRecyclerViewAdapter.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/swipe/ArchiveSwipeHandler.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/swipe/ArchiveSwipeHandler.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/swipe/ISwipeHandler.java
+++ b/app/src/main/java/ch/protonmail/android/adapters/swipe/ISwipeHandler.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/swipe/MarkReadSwipeHandler.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/swipe/MarkReadSwipeHandler.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/swipe/SpamSwipeHandler.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/swipe/SpamSwipeHandler.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/swipe/StarSwipeHandler.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/swipe/StarSwipeHandler.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/app/src/main/java/ch/protonmail/android/adapters/swipe/SwipeAction.kt
+++ b/app/src/main/java/ch/protonmail/android/adapters/swipe/SwipeAction.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
 *
 * This file is part of Proton Mail.
 *
--- a/Show More
+++ b/Show More