Some cleaning (c590ab48) · Commits · Android-smartphones / Fedilab

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ import retrofit2.converter.gson.GsonConverterFactory;

		public abstract class BaseMainActivity extends BaseActivity implements NetworkStateReceiver.NetworkStateReceiverListener, FragmentMastodonTimeline.UpdateCounters, FragmentNotificationContainer.UpdateCounters, FragmentMastodonConversation.UpdateCounters {

		private static final int REQUEST_CODE = 5415;
		public static String currentInstance, currentToken, currentUserID, client_id, client_secret, software;
		public static HashMap<String, List<Emoji>> emojis = new HashMap<>();
		public static Account.API api;
		@@ -297,7 +298,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		};
		private NetworkStateReceiver networkStateReceiver;
		private boolean headerMenuOpen;
		private static final int REQUEST_CODE = 5415;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		@@ -786,7 +786,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		});



		binding.toolbarSearch.setOnSearchClickListener(v -> binding.tabLayout.setVisibility(View.VISIBLE));
		//For receiving data from other activities
		LocalBroadcastManager.getInstance(BaseMainActivity.this).registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA));
		@@ -1073,7 +1072,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt

		if (title.length() > 0) {
		// OG title fetched from source
		if(titleBuilder.length() > 0) titleBuilder.append("\n\n");
		if (titleBuilder.length() > 0)
		titleBuilder.append("\n\n");
		titleBuilder.append(title);
		}

app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,7 @@ public class AccountReportActivity extends BaseBarActivity {
		}

		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		if (item.getItemId() == android.R.id.home) {

app/src/main/java/app/fedilab/android/activities/ComposeActivity.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -107,11 +107,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		private Status statusReply, statusMention, statusQuoted;
		private StatusDraft statusDraft;
		private ComposeAdapter composeAdapter;
		private boolean promptSaveDraft;
		private boolean restoredDraft;
		private List<Attachment> sharedAttachments;


		private final BroadcastReceiver imageReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(android.content.Context context, Intent intent) {
		@@ -138,7 +133,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		}
		}
		};

		private boolean promptSaveDraft;
		private boolean restoredDraft;
		private List<Attachment> sharedAttachments;
		private ActivityPaginationBinding binding;
		private BaseAccount account;
		private String instance, token;

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -117,8 +117,6 @@ public class ProfileActivity extends BaseActivity {
		private String mention_str;
		private WellKnownNodeinfo.NodeInfo nodeInfo;
		private boolean checkRemotely;
		private boolean homeMuted;

		private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -133,6 +131,7 @@ public class ProfileActivity extends BaseActivity {
		}
		}
		};
		private boolean homeMuted;

		@Override
		protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/app/fedilab/android/client/entities/api/Account.java

+28 −32

Original line number	Diff line number	Diff line
		@@ -87,28 +87,6 @@ public class Account implements Serializable {
		public Account moved;
		@SerializedName("role")
		public Role role;


		public static class Role implements Serializable {
		@SerializedName("id")
		public String id;
		@SerializedName("name")
		public String name;
		@SerializedName("color")
		public String color;
		@SerializedName("position")
		public int position;
		@SerializedName("permissions")
		public int permissions;
		@SerializedName("highlighted")
		public boolean highlighted;
		@SerializedName("created_at")
		public Date created_at;
		@SerializedName("updated_at")
		public Date updated_at;
		}


		public transient RelationShip relationShip;

		public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference) {
		@@ -133,6 +111,34 @@ public class Account implements Serializable {
		return SpannableHelper.convert(context, note, null, this, null, viewWeakReference);
		}

		@Override
		public boolean equals(@Nullable Object obj) {
		boolean same = false;
		if (obj instanceof Account) {
		same = this.id.equals(((Account) obj).id);
		}
		return same;
		}

		public static class Role implements Serializable {
		@SerializedName("id")
		public String id;
		@SerializedName("name")
		public String name;
		@SerializedName("color")
		public String color;
		@SerializedName("position")
		public int position;
		@SerializedName("permissions")
		public int permissions;
		@SerializedName("highlighted")
		public boolean highlighted;
		@SerializedName("created_at")
		public Date created_at;
		@SerializedName("updated_at")
		public Date updated_at;
		}

		public static class AccountParams implements Serializable {
		@SerializedName("discoverable")
		public boolean discoverable;
		@@ -150,14 +156,4 @@ public class Account implements Serializable {
		public LinkedHashMap<Integer, Field.FieldParams> fields;

		}


		@Override
		public boolean equals(@Nullable Object obj) {
		boolean same = false;
		if (obj instanceof Account) {
		same = this.id.equals(((Account) obj).id);
		}
		return same;
		}
		}