From 45f7ee4ae1f50c4331bc0bec287de4fb4170d649 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Wed, 11 Mar 2020 19:24:44 +0100
Subject: [PATCH] New beta release

---
 app/build.gradle                                   |  4 ++--
 .../android/activities/BaseMainActivity.java       | 14 +++++++-------
 .../fedilab/android/drawers/StatusListAdapter.java |  3 +++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6016caa0e..fb12d6572 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 351
-        versionName "2.32.0-beta-1"
+        versionCode 352
+        versionName "2.32.0-beta-2"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 3c076e77a..f3a41bac1 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -310,7 +310,7 @@ public abstract class BaseMainActivity extends BaseActivity
         //This task will allow to instance a static PeertubeInformation class
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) {
             try {
-                new RetrievePeertubeInformationAsyncTask(getApplicationContext()).execute();
+                new RetrievePeertubeInformationAsyncTask(getApplicationContext()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             } catch (Exception ignored) {
             }
         }
@@ -1315,10 +1315,10 @@ public abstract class BaseMainActivity extends BaseActivity
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
 
             // Retrieves instance
-            new RetrieveInstanceAsyncTask(getApplicationContext(), BaseMainActivity.this).execute();
+            new RetrieveInstanceAsyncTask(getApplicationContext(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             // Retrieves filters
             if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
-                new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).execute();
+                new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         }
 
@@ -1329,11 +1329,11 @@ public abstract class BaseMainActivity extends BaseActivity
             new TimelineCacheDAO(BaseMainActivity.this, db).removeAfterDate(dateString);
         });
         if (Helper.isLoggedIn(getApplicationContext())) {
-            new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), social, BaseMainActivity.this).execute();
+            new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), social, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
         mutedAccount = new TempMuteDAO(getApplicationContext(), db).getAllTimeMuted(account);
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA){
-            new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ANNOUNCEMENTS, null, BaseMainActivity.this).execute();
+            new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ANNOUNCEMENTS, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
     }
 
@@ -1473,7 +1473,7 @@ public abstract class BaseMainActivity extends BaseActivity
                 if (!isUrl)
                     return;
                 //Here we know that the intent contains a valid URL
-                new RetrieveRemoteDataAsyncTask(BaseMainActivity.this, url, BaseMainActivity.this).execute();
+                new RetrieveRemoteDataAsyncTask(BaseMainActivity.this, url, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         } else if (Intent.ACTION_SEND.equals(action) && type != null) {
             if ("text/plain".equals(type)) {
@@ -2060,7 +2060,7 @@ public abstract class BaseMainActivity extends BaseActivity
             if (accounts != null && accounts.size() > 0) {
                 developers = new ArrayList<>();
                 developers.addAll(accounts);
-                new RetrieveRelationshipAsyncTask(getApplicationContext(), accounts.get(0).getId(), BaseMainActivity.this).execute();
+                new RetrieveRelationshipAsyncTask(getApplicationContext(), accounts.get(0).getId(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         }
     }
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 1c1b17e07..ae4ab16b1 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1063,6 +1063,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             .build(holder.fake_edittext);
                     emojiPopup.toggle();
                 });
+                if( social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
+                    holder.status_add_custom_emoji.setVisibility(View.GONE);
+                }
                 holder.status_add_custom_emoji.setOnClickListener(v -> {
                     SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                     String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);