Changed name to FairEmail

FAQ.md

@@ -1,5 +1,5 @@
-Safe email
-==========
+FairEmail
+=========
 
 Frequently Asked Questions
 --------------------------

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/).

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 {

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.

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.

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 <http://www.gnu.org/licenses/>.
+
+    Copyright 2018 by Marcel Bokhorst (M66B)
+*/
+
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;

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.

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.

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.

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.

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.

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.

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.

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.

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.

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)

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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 <http://www.gnu.org/licenses/>.
+
+    Copyright 2018 by Marcel Bokhorst (M66B)
+*/
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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 <http://www.gnu.org/licenses/>.
+
+    Copyright 2018 by Marcel Bokhorst (M66B)
+*/
+
 public class TupleIdentityEx extends EntityIdentity {
     public String accountName;
 }

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.

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name" translatable="false">Safe email</string>
+    <string name="app_name" translatable="false">FairEmail</string>
     <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
     <string name="app_eula" translatable="false">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.</string>