From 416f716344476ed33def508927d156e2c67e7177 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 9 Aug 2020 15:23:55 +0200
Subject: [PATCH] Fix issue #466

---
 .../android/activities/BasePixelfedComposeActivity.java  | 3 +++
 .../app/fedilab/android/activities/BaseTootActivity.java | 5 ++++-
 .../fedilab/android/asynctasks/PostStatusAsyncTask.java  | 9 +++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java
index e2d767e96..4fd577adf 100644
--- a/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java
@@ -1496,6 +1496,9 @@ public abstract class BasePixelfedComposeActivity extends BaseActivity implement
             if (apiResponse.getError().getStatusCode() == -33) {
                 storeToot(false, true);
             } else {
+                if (apiResponse.getError().getStatusCode() == 404) {
+                    storeToot(false, true);
+                }
                 showAToast(apiResponse.getError().getError());
                 return;
             }
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java
index afa14f26c..98f87535e 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java
@@ -2441,6 +2441,9 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
             if (apiResponse.getError().getStatusCode() == -33) {
                 storeToot(false, true);
             } else {
+                if (apiResponse.getError().getStatusCode() == 404) {
+                    storeToot(false, true);
+                }
                 showAToast(apiResponse.getError().getError());
                 return;
             }
@@ -2499,7 +2502,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
             } else
                 Toasty.success(BaseTootActivity.this, getString(R.string.toot_scheduled), Toast.LENGTH_LONG).show();
         } else {
-            if (apiResponse.getError().getStatusCode() == -33)
+            if (apiResponse.getError().getStatusCode() == -33 )
                 Toasty.info(BaseTootActivity.this, getString(R.string.toast_toot_saved_error), Toast.LENGTH_LONG).show();
         }
         toot_it.setEnabled(true);
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/PostStatusAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/PostStatusAsyncTask.java
index 546fc8bc4..7d7477ee9 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/PostStatusAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/PostStatusAsyncTask.java
@@ -59,13 +59,14 @@ public class PostStatusAsyncTask extends AsyncTask<Void, Void, Void> {
     @Override
     protected Void doInBackground(Void... params) {
 
+        boolean isconnected = Helper.isConnectedToInternet(contextReference.get(), Helper.getLiveInstance(contextReference.get()));
         if (social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
-            boolean isconnected = Helper.isConnectedToInternet(contextReference.get(), Helper.getLiveInstance(contextReference.get()));
             if (isconnected) {
                 if (account == null) {
                     apiResponse = new API(this.contextReference.get()).postStatusAction(status);
-                } else
+                } else {
                     apiResponse = new API(this.contextReference.get(), account.getInstance(), account.getToken()).postStatusAction(status);
+                }
             } else {
                 apiResponse = new APIResponse();
                 Error error = new Error();
@@ -74,12 +75,12 @@ public class PostStatusAsyncTask extends AsyncTask<Void, Void, Void> {
                 apiResponse.setError(error);
             }
         } else {
-            boolean isconnected = Helper.isConnectedToInternet(contextReference.get(), Helper.getLiveInstance(contextReference.get()));
             if (isconnected) {
                 if (account == null) {
                     apiResponse = new GNUAPI(this.contextReference.get()).postStatusAction(status);
-                } else
+                } else {
                     apiResponse = new GNUAPI(this.contextReference.get(), account.getInstance(), account.getToken()).postStatusAction(status);
+                }
             } else {
                 apiResponse = new APIResponse();
                 Error error = new Error();