1 files changed, 32 insertions, 13 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index c5431f72a..a7f733575 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -316,19 +316,6 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
             toot_emoji.setVisibility(View.GONE);
         }
 
-        switch (MainActivity.social){
-            case GNU:
-                toot_it.setText(getText(R.string.queet_it));
-                break;
-            case PLEROMA:
-                toot_it.setText(getText(R.string.submit));
-                break;
-            case FRIENDICA:
-                toot_it.setText(getText(R.string.share));
-                break;
-            default:
-                toot_it.setText(getText(R.string.toot_it));
-        }
 
         drawer_layout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
@@ -405,6 +392,38 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
         else
             account = accountReply;
 
+
+        if( MainActivity.social == null){
+
+            //Update the static variable which manages account type
+            if( account.getSocial() == null || account.getSocial().equals("MASTODON"))
+                MainActivity.social = UpdateAccountInfoAsyncTask.SOCIAL.MASTODON;
+            else if( account.getSocial().equals("PEERTUBE"))
+                MainActivity.social = UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE;
+            else if( account.getSocial().equals("PIXELFED"))
+                MainActivity.social = UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED;
+            else if( account.getSocial().equals("PLEROMA"))
+                MainActivity.social = UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA;
+            else if( account.getSocial().equals("GNU"))
+                MainActivity.social = UpdateAccountInfoAsyncTask.SOCIAL.GNU;
+            else if( account.getSocial().equals("FRIENDICA"))
+                MainActivity.social = UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA;
+        }
+
+        switch (MainActivity.social){
+            case GNU:
+                toot_it.setText(getText(R.string.queet_it));
+                break;
+            case PLEROMA:
+                toot_it.setText(getText(R.string.submit));
+                break;
+            case FRIENDICA:
+                toot_it.setText(getText(R.string.share));
+                break;
+            default:
+                toot_it.setText(getText(R.string.toot_it));
+        }
+
         if( tootReply != null) {
             tootReply();
         }else {