From 7ea97fad6ba7ebaf8fa36ce9bfd4a51a6507ac24 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 14 Aug 2018 05:53:24 +0000 Subject: [PATCH] Changed name to FairEmail --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes FAQ.md | 4 ++-- README.md | 18 ++++++++--------- app/build.gradle | 2 +- .../java/eu/faircode/email/ActivityBase.java | 4 ++-- .../eu/faircode/email/ActivityCompose.java | 4 ++-- .../java/eu/faircode/email/ActivityMain.java | 19 ++++++++++++++++++ .../java/eu/faircode/email/ActivitySetup.java | 4 ++-- .../java/eu/faircode/email/ActivityView.java | 4 ++-- .../eu/faircode/email/AdapterAccount.java | 4 ++-- .../eu/faircode/email/AdapterAttachment.java | 4 ++-- .../java/eu/faircode/email/AdapterFolder.java | 4 ++-- .../eu/faircode/email/AdapterIdentity.java | 4 ++-- .../eu/faircode/email/AdapterMessage.java | 4 ++-- .../eu/faircode/email/AdapterOperation.java | 4 ++-- .../java/eu/faircode/email/ApplicationEx.java | 4 ++-- app/src/main/java/eu/faircode/email/DB.java | 6 +++--- .../java/eu/faircode/email/DaoAccount.java | 4 ++-- .../java/eu/faircode/email/DaoAttachment.java | 4 ++-- .../java/eu/faircode/email/DaoFolder.java | 4 ++-- .../java/eu/faircode/email/DaoIdentity.java | 4 ++-- .../java/eu/faircode/email/DaoMessage.java | 4 ++-- .../java/eu/faircode/email/DaoOperation.java | 4 ++-- .../java/eu/faircode/email/EntityAccount.java | 4 ++-- .../eu/faircode/email/EntityAttachment.java | 4 ++-- .../java/eu/faircode/email/EntityFolder.java | 4 ++-- .../eu/faircode/email/EntityIdentity.java | 4 ++-- .../java/eu/faircode/email/EntityMessage.java | 4 ++-- .../eu/faircode/email/EntityOperation.java | 4 ++-- .../java/eu/faircode/email/FragmentAbout.java | 4 ++-- .../eu/faircode/email/FragmentAccount.java | 4 ++-- .../eu/faircode/email/FragmentAccounts.java | 4 ++-- .../eu/faircode/email/FragmentCompose.java | 4 ++-- .../java/eu/faircode/email/FragmentEula.java | 4 ++-- .../java/eu/faircode/email/FragmentEx.java | 19 ++++++++++++++++++ .../eu/faircode/email/FragmentFolder.java | 4 ++-- .../eu/faircode/email/FragmentFolders.java | 4 ++-- .../eu/faircode/email/FragmentIdentities.java | 4 ++-- .../eu/faircode/email/FragmentIdentity.java | 4 ++-- .../eu/faircode/email/FragmentMessage.java | 4 ++-- .../eu/faircode/email/FragmentMessages.java | 4 ++-- .../eu/faircode/email/FragmentOperations.java | 4 ++-- .../java/eu/faircode/email/FragmentSetup.java | 4 ++-- .../eu/faircode/email/FragmentWebView.java | 4 ++-- .../main/java/eu/faircode/email/Helper.java | 4 ++-- .../java/eu/faircode/email/HtmlHelper.java | 4 ++-- .../java/eu/faircode/email/MessageHelper.java | 4 ++-- .../java/eu/faircode/email/MimeMessageEx.java | 4 ++-- .../main/java/eu/faircode/email/Provider.java | 4 ++-- .../eu/faircode/email/ReceiverAutostart.java | 4 ++-- .../eu/faircode/email/ServiceSynchronize.java | 4 ++-- .../java/eu/faircode/email/SimpleTask.java | 4 ++-- .../eu/faircode/email/TupleAccountStats.java | 4 ++-- .../java/eu/faircode/email/TupleFolderEx.java | 4 ++-- .../eu/faircode/email/TupleIdentityEx.java | 19 ++++++++++++++++++ .../eu/faircode/email/TupleMessageEx.java | 4 ++-- app/src/main/res/values/strings.xml | 2 +- 57 files changed, 169 insertions(+), 112 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ad754f51ff18962bd234badfe252cc6537347315..939bfaeee7b0ce877081832f8e6c56332f2432b6 100644 GIT binary patch delta 33 rcmV++0N($X1eXMmm;^TRPt38LY5@_7v&y3CHg7L&yRjyaVIO69_zDif delta 33 rcmV++0N($X1eXMmm;^74#3HerY5@^`-=pN-s)G^4=aX(F(1b5|_Nfn= diff --git a/FAQ.md b/FAQ.md index 457e2e86..11a32cb7 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 67054f36..2c519b8e 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 fd824aad..67078a32 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 c80a2a78..9ab157d7 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 f52dc45f..87e12988 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 c44ddca3..681f31c9 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 6e046470..8d1831d0 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 934a6c9f..f032d85a 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 0860f344..0b2e98cc 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 8599ad9f..b62738f5 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 c7a01c4d..96a52569 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 26994e42..f9f2b88c 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 00a7c854..24fa3916 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 00f0e686..52a07ddc 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 e7969475..f67bfc92 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 e7bd73f7..23bc8b99 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 229b5e1e..4fa1a4c7 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 7e0de9c1..8627ffd1 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 72f8c8cf..a2f30ccb 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 727feaa9..8294fcc2 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 113250a2..fd1f4fe6 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 bd4a60cd..bb84ba8d 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 41975604..d6b9b234 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 2e93015c..d93e920a 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 125b8bfe..951c8297 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 7f71b91c..5c12cea2 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 c9e5048b..d019041f 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 64e3cf23..4922eaca 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 b3ec1b75..7146ea6c 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 3f3ed93c..ea41a57a 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 20bd075a..bc665996 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 283bc24e..f36d0193 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 88aee173..4737d21d 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 1e677443..bfc93133 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 77008fd4..b18e0b5f 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 7d0a43c8..8f3c0cff 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 f509ef75..985dd999 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 72b1de09..c88aa57c 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 558560cb..67e11d8b 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 c0a1f7e1..d25e0f09 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 f988eb19..ef0867f4 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 6205370a..75a4864d 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 84fcea6b..6b773a86 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 dc6ff5d9..6591cc63 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 f84b19ee..9e91a4d6 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 be110459..48af4a9f 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 d928595e..e7220f03 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 bd24d32e..e7100dde 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 360830da..c20e9427 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 6da10a94..85d4dac9 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 fab1cba1..3e7c4056 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 3c062ea1..d114daa5 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 90435b0b..4b9a3a50 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 8e1fe227..17423624 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 c516bf65..30181e41 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 b682a9c2..8bc0aa58 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.