Refactoring

app/src/main/java/eu/faircode/email/Core.java

@@ -167,7 +167,7 @@ class Core {
             State state, long serial)
             throws JSONException, FolderClosedException {
         try {
-            if (EntityAccount.isTestAccount(account.user)) {
+            if (EntityAccount.isTestUser(account.user)) {
                 ops.clear();
                 return;
             }

app/src/main/java/eu/faircode/email/EmailService.java

@@ -908,14 +908,14 @@ public class EmailService implements AutoCloseable {
 
         if ("pop3".equals(protocol) || "pop3s".equals(protocol)) {
             iservice = isession.getStore(protocol);
-            if (!EntityAccount.isTestAccount(user))
+            if (!EntityAccount.isTestUser(user))
                 iservice.connect(address.getHostAddress(), port, user, null);
 
         } else if ("imap".equals(protocol) || "imaps".equals(protocol) || "gimaps".equals(protocol)) {
             iservice = isession.getStore(protocol);
             if (listener != null)
                 ((IMAPStore) iservice).addStoreListener(listener);
-            if (!EntityAccount.isTestAccount(user)) {
+            if (!EntityAccount.isTestUser(user)) {
                 iservice.connect(address.getHostAddress(), port, user, null);
 
                 // https://www.ietf.org/rfc/rfc2971.txt
@@ -962,7 +962,7 @@ public class EmailService implements AutoCloseable {
             Log.i("Using localhost=" + properties.getProperty("mail." + protocol + ".localhost"));
 
             iservice = isession.getTransport(protocol);
-            if (!EntityAccount.isTestAccount(user))
+            if (!EntityAccount.isTestUser(user))
                 try {
                     iservice.connect(address.getHostAddress(), port, user, null);
                 } catch (MessagingException ex) {

app/src/main/java/eu/faircode/email/EntityAccount.java

@@ -565,7 +565,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
         };
     }
 
-    static boolean isTestAccount(String user) {
+    static boolean isTestUser(String user) {
         return (user != null && user.endsWith("@demo.faircode.eu"));
     }
 
@@ -583,7 +583,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
         return account;
     }
 
-    static void createTestUser(Fragment fragment, String user, Runnable ready) {
+    static void createTestAccount(Fragment fragment, String user, Runnable ready) {
         Bundle args = new Bundle();
         args.putString("user", user);
 

app/src/main/java/eu/faircode/email/EntityIdentity.java

@@ -458,7 +458,7 @@ public class EntityIdentity {
         return (display == null ? name : display);
     }
 
-    static EntityIdentity getTestAccount(Long account, String user) {
+    static EntityIdentity getTestIdentity(Long account, String user) {
         EntityIdentity identity = new EntityIdentity();
         identity.account = account;
         identity.name = "Test identity";
@@ -474,7 +474,7 @@ public class EntityIdentity {
         return identity;
     }
 
-    static void createTestUser(Fragment fragment, long account, String user, Runnable ready) {
+    static void createTestIdentity(Fragment fragment, long account, String user, Runnable ready) {
         Bundle args = new Bundle();
         args.putLong("account", account);
         args.putString("user", user);
@@ -485,7 +485,7 @@ public class EntityIdentity {
                 long account = args.getLong("account");
                 String user = args.getString("user");
                 DB db = DB.getInstance(context);
-                EntityIdentity identity = EntityIdentity.getTestAccount(account, user);
+                EntityIdentity identity = EntityIdentity.getTestIdentity(account, user);
                 identity.id = db.identity().insertIdentity(identity);
                 return null;
             }

app/src/main/java/eu/faircode/email/FragmentAccount.java

@@ -792,8 +792,8 @@ public class FragmentAccount extends FragmentBase {
     }
 
     private void onCheck() {
-        if (EntityAccount.isTestAccount(etUser.getText().toString())) {
-            EntityAccount.createTestUser(this, etUser.getText().toString(), new Runnable() {
+        if (EntityAccount.isTestUser(etUser.getText().toString())) {
+            EntityAccount.createTestAccount(this, etUser.getText().toString(), new Runnable() {
                 @Override
                 public void run() {
                     finish();

app/src/main/java/eu/faircode/email/FragmentIdentity.java

@@ -785,8 +785,8 @@ public class FragmentIdentity extends FragmentBase {
     private void onSave(boolean should) {
         EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
 
-        if (account != null && EntityAccount.isTestAccount(etUser.getText().toString())) {
-            EntityIdentity.createTestUser(this, account.id, etUser.getText().toString(), new Runnable() {
+        if (account != null && EntityAccount.isTestUser(etUser.getText().toString())) {
+            EntityIdentity.createTestIdentity(this, account.id, etUser.getText().toString(), new Runnable() {
                 @Override
                 public void run() {
                     finish();

app/src/main/java/eu/faircode/email/FragmentOAuth.java

@@ -379,8 +379,8 @@ public class FragmentOAuth extends FragmentBase {
                 String name = etName.getText().toString().trim();
                 String email = etEmail.getText().toString().trim();
 
-                if (EntityAccount.isTestAccount(email)) {
-                    EntityAccount.createTestUser(this, email, new Runnable() {
+                if (EntityAccount.isTestUser(email)) {
+                    EntityAccount.createTestAccount(this, email, new Runnable() {
                         @Override
                         public void run() {
                             finish();

app/src/main/java/eu/faircode/email/FragmentPop.java

@@ -473,8 +473,8 @@ public class FragmentPop extends FragmentBase {
     }
 
     private void onSave(boolean should) {
-        if (EntityAccount.isTestAccount(etUser.getText().toString())) {
-            EntityAccount.createTestUser(this, etUser.getText().toString(), new Runnable() {
+        if (EntityAccount.isTestUser(etUser.getText().toString())) {
+            EntityAccount.createTestAccount(this, etUser.getText().toString(), new Runnable() {
                 @Override
                 public void run() {
                     finish();

app/src/main/java/eu/faircode/email/ServiceSend.java

@@ -672,7 +672,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
             throw new IllegalArgumentException("Message body missing");
 
         EntityAccount account = db.account().getAccount(message.account);
-        if (EntityAccount.isTestAccount(account.user)){
+        if (EntityAccount.isTestUser(account.user)){
             db.operation().deleteOperation(operation.id);
             db.message().deleteMessage(message.id);
             return;