diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ad754f51ff..939bfaeee7 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/FAQ.md b/FAQ.md index 457e2e86b8..11a32cb711 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,5 +1,5 @@ -Safe email -========== +FairEmail +========= Frequently Asked Questions -------------------------- diff --git a/README.md b/README.md index 67054f363c..2c519b8e9f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Safe email -========== +FairEmail +========= Simple, secure and efficient email app @@ -67,7 +67,7 @@ See [here](https://github.com/M66B/open-source-email/blob/master/FAQ.md) for a l Support ------- -* For support on Safe email, please go [here](https://forum.xda-developers.com/android/apps-games/source-email-t3824168) +* For support on FairEmail, please go [here](https://forum.xda-developers.com/android/apps-games/source-email-t3824168) Contributing ------------ @@ -79,12 +79,12 @@ are preferred in the form of [pull requests](https://help.github.com/articles/cr *Translations* -* You can translate the in-app texts of Safe email [here](https://crowdin.com/project/open-source-email) +* You can translate the in-app texts of FairEmail [here](https://crowdin.com/project/open-source-email) * If your language is not listed, please send a message through [this contact form](https://contact.faircode.eu/) *Source code* -Building Safe email from source code is straightforward with [Android Studio](http://developer.android.com/sdk/). +Building FairEmail from source code is straightforward with [Android Studio](http://developer.android.com/sdk/). It is expected that you can solve build problems yourself, so there is no support on building. Source code contributions are preferred in the form of [pull requests](https://help.github.com/articles/creating-a-pull-request/). @@ -95,7 +95,7 @@ Please note that you agree to the license below by contributing, including the c Attribution ----------- -Safe email uses: +FairEmail uses: * [JavaMail](https://javaee.github.io/javamail/). Copyright (c) 1997-2018 Oracle® and/or its affiliates. All rights reserved. [GPLv2+CE license](https://javaee.github.io/javamail/JavaMail-License). * [jsoup](https://jsoup.org/). Copyright © 2009 - 2017 Jonathan Hedley. [MIT license](https://jsoup.org/license). @@ -109,15 +109,15 @@ License Copyright (c) 2018 Marcel Bokhorst. All rights reserved -Safe email is free software: you can redistribute it and/or modify +FairEmail 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. -Safe email is distributed in the hope that it will be useful, +FairEmail 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 Safe email. If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/). +along with FairEmail. If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/). diff --git a/app/build.gradle b/app/build.gradle index fd824aad1a..67078a3219 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { targetSdkVersion 28 versionCode 10 versionName "0.10" - archivesBaseName = "SafeEmail-v$versionName" + archivesBaseName = "FairEmail-v$versionName" javaCompileOptions { annotationProcessorOptions { diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index c80a2a781c..9ab157d7dc 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java index f52dc45fcc..87e12988fb 100644 --- a/app/src/main/java/eu/faircode/email/ActivityCompose.java +++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java index c44ddca3c2..681f31c99d 100644 --- a/app/src/main/java/eu/faircode/email/ActivityMain.java +++ b/app/src/main/java/eu/faircode/email/ActivityMain.java @@ -1,5 +1,24 @@ package eu.faircode.email; +/* + This file is part of FairEmail. + + FairEmail 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. + + NetGuard 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 NetGuard. If not, see . + + Copyright 2018 by Marcel Bokhorst (M66B) +*/ + import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 6e046470d9..8d1831d047 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 934a6c9f35..f032d85aad 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java index 0860f34414..0b2e98cc00 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAccount.java +++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java index 8599ad9fca..b62738f5d2 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java +++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java index c7a01c4d06..96a5256970 100644 --- a/app/src/main/java/eu/faircode/email/AdapterFolder.java +++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java index 26994e4220..f9f2b88cf9 100644 --- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java +++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java index 00a7c85483..24fa391622 100644 --- a/app/src/main/java/eu/faircode/email/AdapterMessage.java +++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java index 00f0e68697..52a07ddcc5 100644 --- a/app/src/main/java/eu/faircode/email/AdapterOperation.java +++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index e796947579..f67bfc92af 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java index e7bd73f709..23bc8b996f 100644 --- a/app/src/main/java/eu/faircode/email/DB.java +++ b/app/src/main/java/eu/faircode/email/DB.java @@ -23,9 +23,9 @@ import androidx.room.migration.Migration; import androidx.sqlite.db.SupportSQLiteDatabase; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. @@ -71,7 +71,7 @@ public abstract class DB extends RoomDatabase { private static DB sInstance; - private static final String DB_NAME = "email.2.db"; + private static final String DB_NAME = "fairemail.db"; public static synchronized DB getInstance(Context context) { if (sInstance == null) diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java index 229b5e1e46..4fa1a4c79f 100644 --- a/app/src/main/java/eu/faircode/email/DaoAccount.java +++ b/app/src/main/java/eu/faircode/email/DaoAccount.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/DaoAttachment.java b/app/src/main/java/eu/faircode/email/DaoAttachment.java index 7e0de9c182..8627ffd197 100644 --- a/app/src/main/java/eu/faircode/email/DaoAttachment.java +++ b/app/src/main/java/eu/faircode/email/DaoAttachment.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java index 72f8c8cfae..a2f30ccb42 100644 --- a/app/src/main/java/eu/faircode/email/DaoFolder.java +++ b/app/src/main/java/eu/faircode/email/DaoFolder.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java index 727feaa93a..8294fcc2bb 100644 --- a/app/src/main/java/eu/faircode/email/DaoIdentity.java +++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 113250a23d..fd1f4fe645 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java index bd4a60cd8b..bb84ba8d81 100644 --- a/app/src/main/java/eu/faircode/email/DaoOperation.java +++ b/app/src/main/java/eu/faircode/email/DaoOperation.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java index 41975604d8..d6b9b234ed 100644 --- a/app/src/main/java/eu/faircode/email/EntityAccount.java +++ b/app/src/main/java/eu/faircode/email/EntityAccount.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java index 2e93015cc1..d93e920a86 100644 --- a/app/src/main/java/eu/faircode/email/EntityAttachment.java +++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java index 125b8bfe3d..951c829794 100644 --- a/app/src/main/java/eu/faircode/email/EntityFolder.java +++ b/app/src/main/java/eu/faircode/email/EntityFolder.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java index 7f71b91c7a..5c12cea247 100644 --- a/app/src/main/java/eu/faircode/email/EntityIdentity.java +++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java index c9e5048b4a..d019041f89 100644 --- a/app/src/main/java/eu/faircode/email/EntityMessage.java +++ b/app/src/main/java/eu/faircode/email/EntityMessage.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index 64e3cf237d..4922eacadb 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java index b3ec1b7551..7146ea6c8f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAbout.java +++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 3f3ed93cbe..ea41a57a79 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java index 20bd075a0e..bc66599601 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 283bc24e7d..f36d01934b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentEula.java b/app/src/main/java/eu/faircode/email/FragmentEula.java index 88aee173a1..4737d21deb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentEula.java +++ b/app/src/main/java/eu/faircode/email/FragmentEula.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentEx.java b/app/src/main/java/eu/faircode/email/FragmentEx.java index 1e67744395..bfc93133da 100644 --- a/app/src/main/java/eu/faircode/email/FragmentEx.java +++ b/app/src/main/java/eu/faircode/email/FragmentEx.java @@ -1,5 +1,24 @@ package eu.faircode.email; +/* + This file is part of FairEmail. + + FairEmail 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. + + NetGuard 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 NetGuard. If not, see . + + Copyright 2018 by Marcel Bokhorst (M66B) +*/ + import android.content.res.Configuration; import android.os.Bundle; import android.util.Log; diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index 77008fd47e..b18e0b5fbb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index 7d0a43c8ca..8f3c0cff27 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java index f509ef7500..985dd99933 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 72b1de09bb..c88aa57c55 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index 558560cb24..67e11d8b00 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessage.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index c0a1f7e1b5..d25e0f0905 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java index f988eb19af..ef0867f4a0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOperations.java +++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 6205370acd..75a4864dec 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/FragmentWebView.java b/app/src/main/java/eu/faircode/email/FragmentWebView.java index 84fcea6b6d..6b773a867f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentWebView.java +++ b/app/src/main/java/eu/faircode/email/FragmentWebView.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index dc6ff5d986..6591cc6393 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index f84b19eeae..9e91a4d641 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index be110459cb..48af4a9f50 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/MimeMessageEx.java b/app/src/main/java/eu/faircode/email/MimeMessageEx.java index d928595e41..e7220f033f 100644 --- a/app/src/main/java/eu/faircode/email/MimeMessageEx.java +++ b/app/src/main/java/eu/faircode/email/MimeMessageEx.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/Provider.java b/app/src/main/java/eu/faircode/email/Provider.java index bd24d32e60..e7100ddeab 100644 --- a/app/src/main/java/eu/faircode/email/Provider.java +++ b/app/src/main/java/eu/faircode/email/Provider.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/ReceiverAutostart.java b/app/src/main/java/eu/faircode/email/ReceiverAutostart.java index 360830da63..c20e942727 100644 --- a/app/src/main/java/eu/faircode/email/ReceiverAutostart.java +++ b/app/src/main/java/eu/faircode/email/ReceiverAutostart.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 6da10a94ac..85d4dac9bb 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java index fab1cba12d..3e7c40568f 100644 --- a/app/src/main/java/eu/faircode/email/SimpleTask.java +++ b/app/src/main/java/eu/faircode/email/SimpleTask.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/TupleAccountStats.java b/app/src/main/java/eu/faircode/email/TupleAccountStats.java index 3c062ea140..d114daa52d 100644 --- a/app/src/main/java/eu/faircode/email/TupleAccountStats.java +++ b/app/src/main/java/eu/faircode/email/TupleAccountStats.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java index 90435b0bae..4b9a3a507e 100644 --- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java +++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/java/eu/faircode/email/TupleIdentityEx.java b/app/src/main/java/eu/faircode/email/TupleIdentityEx.java index 8e1fe227a4..17423624c4 100644 --- a/app/src/main/java/eu/faircode/email/TupleIdentityEx.java +++ b/app/src/main/java/eu/faircode/email/TupleIdentityEx.java @@ -1,5 +1,24 @@ package eu.faircode.email; +/* + This file is part of FairEmail. + + FairEmail 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. + + NetGuard 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 NetGuard. If not, see . + + Copyright 2018 by Marcel Bokhorst (M66B) +*/ + public class TupleIdentityEx extends EntityIdentity { public String accountName; } diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java index c516bf65c9..30181e4182 100644 --- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java +++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java @@ -1,9 +1,9 @@ package eu.faircode.email; /* - This file is part of Safe email. + This file is part of FairEmail. - Safe email is free software: you can redistribute it and/or modify + FairEmail 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. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b682a9c2db..8bc0aa58ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Safe email + FairEmail Copyright Ⓒ 2018 by M. Bokhorst THIS SOFTWARE IS PROVIDED BY THE AUTHOR \'\'AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.