Fix delayed

3 files changed, 5 insertions, 4 deletions

diff --git a/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
index 48e2c2dd8..7fa857818 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
@@ -58,7 +58,7 @@ public class UpdateAccountInfoByIDAsyncTask extends AsyncTask<Void, Void, Void>
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
         String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
         Account account = null;
-        if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA)
+        if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED )
             account = new API(this.contextReference.get()).verifyCredentials();
         else if (social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) {
             account = new PeertubeAPI(this.contextReference.get()).verifyCredentials();
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 4a2c9eaf0..d7dfe2b82 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -2183,7 +2183,7 @@ public class Helper {
                                     if (accountChoice.getSocial() != null && accountChoice.getSocial().equals("PEERTUBE"))
                                         Toasty.info(activity.getApplicationContext(), activity.getString(R.string.toast_account_changed, "@" + accountChoice.getAcct()), Toast.LENGTH_LONG).show();
                                     else
-                                        Toasty.info(activity, activity.getString(R.string.toast_account_changed, "@" + accountChoice.getAcct() + "@" + accountChoice.getInstance()), Toast.LENGTH_LONG).show();
+                                        Toasty.info(activity, activity.getString(R.string.toast_account_changed, "@" + accountChoice.getUsername() + "@" + accountChoice.getInstance()), Toast.LENGTH_LONG).show();
                                     Intent changeAccount = new Intent(activity, MainActivity.class);
                                     changeAccount.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                                     activity.startActivity(changeAccount);
@@ -3508,11 +3508,12 @@ public class Helper {
             patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
         } catch (Exception ignored) {
         }
-        if (patch_provider)
+        if (patch_provider) {
             try {
                 Security.insertProviderAt(Conscrypt.newProvider(), 1);
             } catch (Exception ignored) {
             }
+        }
     }
 
 
diff --git a/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java b/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
index c936a923d..e6be06e1b 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
@@ -303,7 +303,7 @@ public class AccountDAO {
      */
     public boolean userExist(Account account) {
         Cursor mCount = db.rawQuery("select count(*) from " + Sqlite.TABLE_USER_ACCOUNT
-                + " where " + Sqlite.COL_ACCT + " = '" + account.getAcct() + "' AND " + Sqlite.COL_INSTANCE + " = '" + account.getInstance() + "'", null);
+                + " where " + Sqlite.COL_USERNAME + " = '" + account.getUsername() + "' AND " + Sqlite.COL_INSTANCE + " = '" + account.getInstance() + "'", null);
         mCount.moveToFirst();
         int count = mCount.getInt(0);
         mCount.close();