diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
index 0e18a3e79..b3de860c8 100644
--- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
@@ -315,7 +315,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
             getIntent.setType("image/*");
 
             Intent pickIntent = new Intent(Intent.ACTION_PICK);
-            pickIntent.setDataAndType(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI,"image/*");
+            pickIntent.setDataAndType(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
 
             Intent chooserIntent = Intent.createChooser(getIntent, getString(R.string.toot_select_image));
             chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[]{pickIntent});
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/AccountAdmin.java b/app/src/main/java/app/fedilab/android/client/Entities/AccountAdmin.java
index 46b017287..f7b5d3f0d 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/AccountAdmin.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/AccountAdmin.java
@@ -52,7 +52,7 @@ public class AccountAdmin implements Parcelable {
     public AccountAdmin() {
     }
 
-    protected AccountAdmin(Parcel in) {
+    private AccountAdmin(Parcel in) {
         this.id = in.readString();
         this.username = in.readString();
         long tmpCreated_at = in.readLong();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/AccountCreation.java b/app/src/main/java/app/fedilab/android/client/Entities/AccountCreation.java
index 82ea26b71..300a15b44 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/AccountCreation.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/AccountCreation.java
@@ -45,6 +45,7 @@ public class AccountCreation {
         this.password = password;
     }
 
+    @SuppressWarnings("unused")
     public String getPasswordConfirm() {
         return passwordConfirm;
     }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Announcement.java b/app/src/main/java/app/fedilab/android/client/Entities/Announcement.java
index 070b127fd..31b84825a 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Announcement.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Announcement.java
@@ -16,6 +16,7 @@ package app.fedilab.android.client.Entities;
 
 import java.util.Date;
 
+@SuppressWarnings("unused")
 public class Announcement extends Status {
     private Date startAt;
     private Date endAt;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Attachment.java b/app/src/main/java/app/fedilab/android/client/Entities/Attachment.java
index 9e3d23396..faa49f5cd 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Attachment.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Attachment.java
@@ -22,6 +22,7 @@ import android.os.Parcelable;
  * Manages Media
  */
 
+@SuppressWarnings("unused")
 public class Attachment implements Parcelable {
 
     public static final Creator<Attachment> CREATOR = new Creator<Attachment>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Card.java b/app/src/main/java/app/fedilab/android/client/Entities/Card.java
index 54bb038d5..09a259b2e 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Card.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Card.java
@@ -25,6 +25,7 @@ import android.os.Parcelable;
  * All values are not implemented
  */
 
+@SuppressWarnings("unused")
 public class Card implements Parcelable {
 
     public static final Creator<Card> CREATOR = new Creator<Card>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Charts.java b/app/src/main/java/app/fedilab/android/client/Entities/Charts.java
index d0f4eb3d9..e5aa622cf 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Charts.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Charts.java
@@ -18,6 +18,7 @@ import java.util.List;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+@SuppressWarnings("unused")
 public class Charts {
 
     private List<String> xLabels;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Emojis.java b/app/src/main/java/app/fedilab/android/client/Entities/Emojis.java
index f187de3b4..756830bac 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Emojis.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Emojis.java
@@ -41,7 +41,6 @@ public class Emojis implements Parcelable {
     private String url;
     private boolean visible_in_picker;
     private Drawable drawable;
-    private boolean drawableFound;
 
     public Emojis() {
     }
@@ -106,11 +105,4 @@ public class Emojis implements Parcelable {
         this.drawable = drawable;
     }
 
-    public boolean isDrawableFound() {
-        return drawableFound;
-    }
-
-    public void setDrawableFound(boolean drawableFound) {
-        this.drawableFound = drawableFound;
-    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Filters.java b/app/src/main/java/app/fedilab/android/client/Entities/Filters.java
index dc5d5b888..954bb176a 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Filters.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Filters.java
@@ -23,6 +23,7 @@ import java.util.Date;
  * Manage filters
  */
 
+@SuppressWarnings("unused")
 public class Filters {
 
     private String id;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/HowToVideo.java b/app/src/main/java/app/fedilab/android/client/Entities/HowToVideo.java
index 5ab9bb1a4..fe8fc3414 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/HowToVideo.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/HowToVideo.java
@@ -18,6 +18,7 @@ package app.fedilab.android.client.Entities;
  * Created by Thomas on 29/09/2018.
  * Manage how to videos
  */
+@SuppressWarnings("unused")
 public class HowToVideo {
 
     private String id;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Instance.java b/app/src/main/java/app/fedilab/android/client/Entities/Instance.java
index 9914aa863..290c9246c 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Instance.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Instance.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
  * Describes instance
  */
 
+@SuppressWarnings("unused")
 public class Instance {
 
     private String uri;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java b/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java
index 2c963f18c..0e5789935 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java
@@ -14,6 +14,7 @@
  * see <http://www.gnu.org/licenses>. */
 package app.fedilab.android.client.Entities;
 
+@SuppressWarnings("unused")
 public class InstanceNodeInfo {
 
     private String name;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java b/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java
index cf89a4b2a..763f27cd2 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java
@@ -14,6 +14,7 @@ package app.fedilab.android.client.Entities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+@SuppressWarnings("unused")
 public class InstanceReg {
 
     private String domain;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/InstanceSocial.java b/app/src/main/java/app/fedilab/android/client/Entities/InstanceSocial.java
index 50fba54c5..8f563520e 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/InstanceSocial.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/InstanceSocial.java
@@ -21,6 +21,7 @@ import java.util.Date;
  * Describes instance from instances.social
  */
 
+@SuppressWarnings("unused")
 public class InstanceSocial {
 
     private String id;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/NodeInfo.java b/app/src/main/java/app/fedilab/android/client/Entities/NodeInfo.java
index 50e3956ef..9c5f34bb9 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/NodeInfo.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/NodeInfo.java
@@ -14,6 +14,7 @@
  * see <http://www.gnu.org/licenses>. */
 package app.fedilab.android.client.Entities;
 
+@SuppressWarnings("unused")
 public class NodeInfo {
     private String rel;
     private String href;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
index ee2ddd279..dfab55b01 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
@@ -43,8 +43,6 @@ public class Notification implements Parcelable {
     private Date created_at;
     private Account account;
     private Status status;
-    private boolean notificationAnimated = false;
-    private boolean isEmojiFound = false;
 
     protected Notification(Parcel in) {
         id = in.readString();
@@ -115,19 +113,5 @@ public class Notification implements Parcelable {
         return otherNotifications != null && (otherNotifications == this || otherNotifications instanceof Notification && this.getId().equals(((Notification) otherNotifications).getId()));
     }
 
-    public boolean isNotificationAnimated() {
-        return notificationAnimated;
-    }
 
-    public void setNotificationAnimated(boolean notificationAnimated) {
-        this.notificationAnimated = notificationAnimated;
-    }
-
-    public boolean isEmojiFound() {
-        return isEmojiFound;
-    }
-
-    public void setEmojiFound(boolean emojiFound) {
-        isEmojiFound = emojiFound;
-    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/NotificationCharts.java b/app/src/main/java/app/fedilab/android/client/Entities/NotificationCharts.java
index 0b2c632ee..0cdbb134f 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/NotificationCharts.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/NotificationCharts.java
@@ -18,6 +18,7 @@ import java.util.List;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+@SuppressWarnings("unused")
 public class NotificationCharts {
 
     private List<String> xLabels;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Peertube.java b/app/src/main/java/app/fedilab/android/client/Entities/Peertube.java
index 26ac125ff..36fcd1c1e 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Peertube.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Peertube.java
@@ -25,6 +25,7 @@ import java.util.List;
  * Created by Thomas on 29/09/2018.
  * Manage how to videos
  */
+@SuppressWarnings("unused")
 public class Peertube {
 
     private String id;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PeertubeComment.java b/app/src/main/java/app/fedilab/android/client/Entities/PeertubeComment.java
index 0b1dd1210..886c516d6 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/PeertubeComment.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/PeertubeComment.java
@@ -18,6 +18,7 @@ package app.fedilab.android.client.Entities;
  * Created by Thomas on 23/01/2019.
  * Manage Peertube comments
  */
+@SuppressWarnings("unused")
 public class PeertubeComment {
 
     private String id;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PeertubeNotification.java b/app/src/main/java/app/fedilab/android/client/Entities/PeertubeNotification.java
index 0b9573215..955f09963 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/PeertubeNotification.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/PeertubeNotification.java
@@ -21,6 +21,7 @@ import java.util.Date;
  * Created by Thomas on 23/01/2019.
  */
 
+@SuppressWarnings("unused")
 public class PeertubeNotification {
 
     private String id;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStory.java b/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStory.java
index fdebddf7a..00560d660 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStory.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStory.java
@@ -25,6 +25,7 @@ import java.util.List;
  * Created by Thomas on 01/11/2019.
  */
 
+@SuppressWarnings("unused")
 public class PixelFedStory implements Parcelable {
 
     public static final Parcelable.Creator<PixelFedStory> CREATOR = new Parcelable.Creator<PixelFedStory>() {
@@ -49,7 +50,7 @@ public class PixelFedStory implements Parcelable {
     public PixelFedStory() {
     }
 
-    protected PixelFedStory(Parcel in) {
+    private PixelFedStory(Parcel in) {
         this.id = in.readString();
         this.photo = in.readString();
         this.name = in.readString();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStoryItem.java b/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStoryItem.java
index f6394fb5a..754600398 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStoryItem.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/PixelFedStoryItem.java
@@ -23,6 +23,7 @@ import java.util.Date;
  * Created by Thomas on 01/11/2019.
  */
 
+@SuppressWarnings("unused")
 public class PixelFedStoryItem implements Parcelable {
 
     public static final Parcelable.Creator<PixelFedStoryItem> CREATOR = new Parcelable.Creator<PixelFedStoryItem>() {
@@ -50,7 +51,7 @@ public class PixelFedStoryItem implements Parcelable {
     public PixelFedStoryItem() {
     }
 
-    protected PixelFedStoryItem(Parcel in) {
+    private PixelFedStoryItem(Parcel in) {
         this.id = in.readString();
         this.type = in.readString();
         this.length = in.readInt();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Playlist.java b/app/src/main/java/app/fedilab/android/client/Entities/Playlist.java
index 71ab30de4..600ce279d 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Playlist.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Playlist.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
  * Manage List
  */
 
+@SuppressWarnings("unused")
 public class Playlist implements Parcelable {
 
     public static final Parcelable.Creator<Playlist> CREATOR = new Parcelable.Creator<Playlist>() {
@@ -56,7 +57,7 @@ public class Playlist implements Parcelable {
     public Playlist() {
     }
 
-    protected Playlist(Parcel in) {
+    private Playlist(Parcel in) {
         this.id = in.readString();
         this.uuid = in.readString();
         this.displayName = in.readString();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PleromaAdmin.java b/app/src/main/java/app/fedilab/android/client/Entities/PleromaAdmin.java
index 2d4c8491f..73ef90090 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/PleromaAdmin.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/PleromaAdmin.java
@@ -23,6 +23,7 @@ import android.os.Parcelable;
  * Manage Entity PleromaAdmin
  */
 
+@SuppressWarnings("unused")
 public class PleromaAdmin implements Parcelable {
 
     public static final Creator<PleromaAdmin> CREATOR = new Creator<PleromaAdmin>() {
@@ -45,7 +46,7 @@ public class PleromaAdmin implements Parcelable {
     public PleromaAdmin() {
     }
 
-    protected PleromaAdmin(Parcel in) {
+    private PleromaAdmin(Parcel in) {
         this.nickname = in.readString();
         this.email = in.readString();
         this.password = in.readString();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Poll.java b/app/src/main/java/app/fedilab/android/client/Entities/Poll.java
index 2efadbf6e..94b4af4e0 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Poll.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Poll.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@SuppressWarnings("unused")
 public class Poll implements Parcelable {
 
     public static final Creator<Poll> CREATOR = new Creator<Poll>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PollOptions.java b/app/src/main/java/app/fedilab/android/client/Entities/PollOptions.java
index 1f03e5904..90f389e57 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/PollOptions.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/PollOptions.java
@@ -77,7 +77,7 @@ public class PollOptions implements Parcelable {
         return titleSpan;
     }
 
-    public void setTitleSpan(SpannableString titleSpan) {
+    void setTitleSpan(SpannableString titleSpan) {
         this.titleSpan = titleSpan;
     }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/RemoteInstance.java b/app/src/main/java/app/fedilab/android/client/Entities/RemoteInstance.java
index 94f0a6cc6..8ff5ddbd3 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/RemoteInstance.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/RemoteInstance.java
@@ -25,6 +25,7 @@ import java.util.List;
  * Manages following instances
  */
 
+@SuppressWarnings("unused")
 public class RemoteInstance implements Parcelable {
 
     public static final Creator<RemoteInstance> CREATOR = new Creator<RemoteInstance>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Report.java b/app/src/main/java/app/fedilab/android/client/Entities/Report.java
index 6288fc398..36428bc70 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Report.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Report.java
@@ -21,6 +21,7 @@ import android.os.Parcelable;
 import java.util.Date;
 import java.util.List;
 
+@SuppressWarnings("unused")
 public class Report implements Parcelable {
 
     public static final Creator<Report> CREATOR = new Creator<Report>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/RetrieveFeedsParam.java b/app/src/main/java/app/fedilab/android/client/Entities/RetrieveFeedsParam.java
index a1518a5c6..01d78c0c8 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/RetrieveFeedsParam.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/RetrieveFeedsParam.java
@@ -18,6 +18,7 @@ import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
 import app.fedilab.android.helper.FilterToots;
 
 
+@SuppressWarnings("unused")
 public class RetrieveFeedsParam {
 
     private FilterToots filterToots;
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Schedule.java b/app/src/main/java/app/fedilab/android/client/Entities/Schedule.java
index dec7343d1..8b1a58deb 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Schedule.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Schedule.java
@@ -26,6 +26,7 @@ import java.util.List;
  * Manages scheduled toots
  */
 
+@SuppressWarnings("unused")
 public class Schedule implements Parcelable {
 
     public static final Parcelable.Creator<Schedule> CREATOR = new Parcelable.Creator<Schedule>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/StoredStatus.java b/app/src/main/java/app/fedilab/android/client/Entities/StoredStatus.java
index 2c9132b48..d8ed6cef2 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/StoredStatus.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/StoredStatus.java
@@ -11,6 +11,7 @@ import java.util.Date;
  * Manage Stored status
  */
 
+@SuppressWarnings("unused")
 public class StoredStatus implements Parcelable {
 
     public static final Creator<StoredStatus> CREATOR = new Creator<StoredStatus>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Tag.java b/app/src/main/java/app/fedilab/android/client/Entities/Tag.java
index 148a002ab..98f9d93c0 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Tag.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Tag.java
@@ -25,6 +25,7 @@ import java.util.List;
  * Manage Tags
  */
 
+@SuppressWarnings("unused")
 public class Tag implements Parcelable {
 
     public static final Creator<Tag> CREATOR = new Creator<Tag>() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java b/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java
index 647e6be20..6ca028a11 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java
@@ -43,7 +43,7 @@ public class TrendsHistory implements Parcelable {
     public TrendsHistory() {
     }
 
-    protected TrendsHistory(Parcel in) {
+    private TrendsHistory(Parcel in) {
         this.days = in.readLong();
         this.uses = in.readInt();
         this.accounts = in.readInt();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/UserNote.java b/app/src/main/java/app/fedilab/android/client/Entities/UserNote.java
index 1810f489f..55c2c1ffb 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/UserNote.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/UserNote.java
@@ -16,6 +16,7 @@ package app.fedilab.android.client.Entities;
 
 import java.util.Date;
 
+@SuppressWarnings("unused")
 public class UserNote {
 
     private String acct;
diff --git a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
index 188aac831..1276c0516 100644
--- a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
+++ b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
@@ -657,7 +657,7 @@ public class PeertubeAPI {
         try {
             String response = new HttpsConnection(context, this.instance).get(getAbsoluteUrl("/users/me"), 60, null, prefKeyOauthTokenT);
             JSONObject accountObject = new JSONObject(response).getJSONObject("account");
-            account = parseAccountResponsePeertube( accountObject);
+            account = parseAccountResponsePeertube(accountObject);
             if (social != null) {
                 account.setSocial(social.toUpperCase());
             }
diff --git a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
index 3a5321a48..18728988f 100644
--- a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
@@ -79,8 +79,6 @@ public class CustomEmojiAdapter extends BaseAdapter {
         }
 
 
-        //if (!emoji.isDrawableFound()) {
-        emoji.setDrawableFound(true);
         SharedPreferences sharedpreferences = parent.getContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
         Glide.with(parent.getContext())
@@ -98,7 +96,6 @@ public class CustomEmojiAdapter extends BaseAdapter {
 
                     }
                 });
-        // }
         return convertView;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
index 0fed7f5e4..36e6e4313 100644
--- a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
@@ -478,7 +478,6 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
     }
 
 
-
     @Override
     public void onCompletion(MediaPlayer mp) {
         stopPlaying();
diff --git a/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java b/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
index 28709948a..66f996791 100644
--- a/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
+++ b/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
@@ -101,7 +101,8 @@ public class MastalabWebViewClient extends WebViewClient {
                         return new WebResourceResponse("text/plain", "utf-8", nothing);
 
                     }
-                } catch (URISyntaxException ignored) {}
+                } catch (URISyntaxException ignored) {
+                }
             }
         }
         return super.shouldInterceptRequest(view, url);