Commit 6fea7bbe authored by Thomas's avatar Thomas
Browse files

Some fixes

parent 5521a14f

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

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.lifecycle.ViewModelProvider; 
import java.util.ArrayList;

import java.util.List;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.BuildConfig;

import app.fedilab.android.R;

import app.fedilab.android.client.entities.api.Account;
@@ -112,12 +113,12 @@ public class AboutActivity extends BaseActivity { 
                    AccountsVM accountsVM = new ViewModelProvider(AboutActivity.this).get(AccountsVM.class);

                    List<String> ids = new ArrayList<>();

                    ids.add(account.id);

                    accountsVM.getRelationships(MainActivity.currentInstance, MainActivity.currentToken, ids)

                    accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids)

                            .observe(AboutActivity.this, relationShips -> {

                                if (relationShips != null && relationShips.size() > 0) {

                                    if (!relationShips.get(0).following) {

                                        binding.accountFollow.setVisibility(View.VISIBLE);

                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(MainActivity.currentInstance, MainActivity.currentToken, account.id, true, false)

                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)

                                                .observe(AboutActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE)));

                                    }

                                }

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

+8 −8
Original line number Diff line number Diff line
@@ -171,14 +171,14 @@ public class AdminAccountActivity extends BaseActivity { 


        binding.disableAction.setOnClickListener(v -> {

            if (adminAccount.disabled) {

                adminVM.enable(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.enable(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminAccountActivity.this, adminAccountResult -> {

                            adminAccount.disabled = false;

                            binding.disableAction.setText(R.string.disable);

                            binding.disabled.setText(R.string.no);

                        });

            } else {

                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "disable ", null, null, null, null);

                adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "disable ", null, null, null, null);

                adminAccount.disabled = true;

                binding.disableAction.setText(R.string.undisable);

                binding.disabled.setText(R.string.yes);
@@ -187,14 +187,14 @@ public class AdminAccountActivity extends BaseActivity { 


        binding.approveAction.setOnClickListener(v -> {

            if (adminAccount.approved) {

                adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.reject(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminAccountActivity.this, adminAccountResult -> {

                            adminAccount.approved = false;

                            binding.approveAction.setText(R.string.approve);

                            binding.approved.setText(R.string.no);

                        });

            } else {

                adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account.id);

                adminVM.approve(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id);

                adminAccount.approved = true;

                binding.approveAction.setText(R.string.reject);

                binding.approved.setText(R.string.yes);
@@ -203,14 +203,14 @@ public class AdminAccountActivity extends BaseActivity { 


        binding.silenceAction.setOnClickListener(v -> {

            if (adminAccount.disabled) {

                adminVM.unsilence(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.unsilence(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminAccountActivity.this, adminAccountResult -> {

                            adminAccount.silenced = false;

                            binding.silenceAction.setText(R.string.silence);

                            binding.disabled.setText(R.string.no);

                        });

            } else {

                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "silence", null, null, null, null);

                adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "silence", null, null, null, null);

                adminAccount.silenced = true;

                binding.disableAction.setText(R.string.unsilence);

                binding.disabled.setText(R.string.yes);
@@ -219,14 +219,14 @@ public class AdminAccountActivity extends BaseActivity { 


        binding.suspendAction.setOnClickListener(v -> {

            if (adminAccount.disabled) {

                adminVM.unsuspend(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.unsuspend(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminAccountActivity.this, adminAccountResult -> {

                            adminAccount.suspended = false;

                            binding.suspendAction.setText(R.string.suspend);

                            binding.suspended.setText(R.string.no);

                        });

            } else {

                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "suspend", null, null, null, null);

                adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "suspend", null, null, null, null);

                adminAccount.suspended = true;

                binding.disableAction.setText(R.string.unsuspend);

                binding.suspended.setText(R.string.yes);

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

+8 −8
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class AdminReportActivity extends BaseActivity { 


        binding.disableAction.setOnClickListener(v -> {

            if (adminAccount.disabled) {

                adminVM.enable(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.enable(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminReportActivity.this, adminAccountResult -> {

                            if (adminAccountResult != null) {

                                adminAccount.disabled = false;
@@ -183,7 +183,7 @@ public class AdminReportActivity extends BaseActivity { 


                        });

            } else {

                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "disable ", null, null, null, null);

                adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "disable ", null, null, null, null);

                adminAccount.disabled = true;

                binding.disableAction.setText(R.string.undisable);

                binding.disabled.setText(R.string.yes);
@@ -192,7 +192,7 @@ public class AdminReportActivity extends BaseActivity { 


        binding.approveAction.setOnClickListener(v -> {

            if (adminAccount.approved) {

                adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.reject(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminReportActivity.this, adminAccountResult -> {

                            if (adminAccountResult != null) {

                                adminAccount.approved = false;
@@ -204,7 +204,7 @@ public class AdminReportActivity extends BaseActivity { 


                        });

            } else {

                adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account.id);

                adminVM.approve(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id);

                adminAccount.approved = true;

                binding.approveAction.setText(R.string.reject);

                binding.approved.setText(R.string.yes);
@@ -213,7 +213,7 @@ public class AdminReportActivity extends BaseActivity { 


        binding.silenceAction.setOnClickListener(v -> {

            if (adminAccount.disabled) {

                adminVM.unsilence(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.unsilence(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminReportActivity.this, adminAccountResult -> {

                            if (adminAccountResult != null) {

                                adminAccount.silenced = false;
@@ -224,7 +224,7 @@ public class AdminReportActivity extends BaseActivity { 
                            }

                        });

            } else {

                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "silence", null, null, null, null);

                adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "silence", null, null, null, null);

                adminAccount.silenced = true;

                binding.disableAction.setText(R.string.unsilence);

                binding.disabled.setText(R.string.yes);
@@ -233,7 +233,7 @@ public class AdminReportActivity extends BaseActivity { 


        binding.suspendAction.setOnClickListener(v -> {

            if (adminAccount.disabled) {

                adminVM.unsuspend(MainActivity.currentInstance, MainActivity.currentToken, account.id)

                adminVM.unsuspend(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)

                        .observe(AdminReportActivity.this, adminAccountResult -> {

                            if (adminAccountResult != null) {

                                adminAccount.suspended = false;
@@ -244,7 +244,7 @@ public class AdminReportActivity extends BaseActivity { 
                            }

                        });

            } else {

                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "suspend", null, null, null, null);

                adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "suspend", null, null, null, null);

                adminAccount.suspended = true;

                binding.disableAction.setText(R.string.unsuspend);

                binding.suspended.setText(R.string.yes);

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

+4 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.fragment.app.Fragment; 
import androidx.lifecycle.ViewModelProvider;

import androidx.preference.PreferenceManager;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;

import app.fedilab.android.client.entities.api.Status;

import app.fedilab.android.client.entities.app.QuickLoad;
@@ -97,11 +98,11 @@ public class ContextActivity extends BaseActivity { 
            mainHandler.post(myRunnable);

        }).start();

        StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);

        timelinesVM.getStatus(MainActivity.currentInstance, MainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> {

        timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> {

            if (status != null) {

                StatusCache statusCache = new StatusCache();

                statusCache.instance = MainActivity.currentInstance;

                statusCache.user_id = MainActivity.currentUserID;

                statusCache.instance = BaseMainActivity.currentInstance;

                statusCache.user_id = BaseMainActivity.currentUserID;

                statusCache.status = status;

                statusCache.status_id = status.id;

                //Update cache

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

+3 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.lifecycle.ViewModelProvider; 
import java.util.ArrayList;

import java.util.List;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;

import app.fedilab.android.client.entities.api.Account;

import app.fedilab.android.client.entities.api.Status;
@@ -92,12 +93,12 @@ public class PartnerShipActivity extends BaseActivity { 
                    AccountsVM accountsVM = new ViewModelProvider(PartnerShipActivity.this).get(AccountsVM.class);

                    List<String> ids = new ArrayList<>();

                    ids.add(account.id);

                    accountsVM.getRelationships(MainActivity.currentInstance, MainActivity.currentToken, ids)

                    accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids)

                            .observe(PartnerShipActivity.this, relationShips -> {

                                if (relationShips != null && relationShips.size() > 0) {

                                    if (!relationShips.get(0).following) {

                                        binding.accountFollow.setVisibility(View.VISIBLE);

                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(MainActivity.currentInstance, MainActivity.currentToken, account.id, true, false)

                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)

                                                .observe(PartnerShipActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE)));

                                    }

                                }