me/Fedilab
1
0
Fork 0
forked from mirrors/Fedilab
Code Issues Pull requests Projects Releases Packages Wiki Activity

apply changes

Browse source
This commit is contained in:
Thomas 2022-11-12 18:57:07 +01:00
parent 144dddcc0f
commit 6063246b96
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java
View file

@ -147,7 +147,7 @@ public class AdminAccountActivity extends BaseActivity {
}); });
binding.silenceAction.setOnClickListener(v -> { binding.silenceAction.setOnClickListener(v -> {
if (adminAccount.disabled) { if (adminAccount.silenced) {
adminVM.unsilence(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, adminAccount.id) adminVM.unsilence(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, adminAccount.id)
.observe(AdminAccountActivity.this, adminAccountResult -> { .observe(AdminAccountActivity.this, adminAccountResult -> {
adminAccount = adminAccountResult; adminAccount = adminAccountResult;
@ -161,7 +161,7 @@ public class AdminAccountActivity extends BaseActivity {
}); });
binding.suspendAction.setOnClickListener(v -> { binding.suspendAction.setOnClickListener(v -> {
if (adminAccount.disabled) { if (adminAccount.suspended) {
adminVM.unsuspend(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, adminAccount.id) adminVM.unsuspend(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, adminAccount.id)
.observe(AdminAccountActivity.this, adminAccountResult -> { .observe(AdminAccountActivity.this, adminAccountResult -> {
adminAccount = adminAccountResult; adminAccount = adminAccountResult;

7
app/src/main/java/app/fedilab/android/viewmodel/mastodon/AdminVM.java
View file

@ -17,6 +17,7 @@ package app.fedilab.android.viewmodel.mastodon;
import android.app.Application; import android.app.Application;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
@ -213,10 +214,13 @@ public class AdminVM extends AndroidViewModel {
AdminAccount adminAccount = null; AdminAccount adminAccount = null;
Call<AdminAccount> approveCall = mastodonAdminService.approve(token, accountId); Call<AdminAccount> approveCall = mastodonAdminService.approve(token, accountId);
if (approveCall != null) { if (approveCall != null) {
Log.v(Helper.TAG, "request: " + approveCall.request());
try { try {
Response<AdminAccount> approveResponse = approveCall.execute(); Response<AdminAccount> approveResponse = approveCall.execute();
if (approveResponse.isSuccessful()) { if (approveResponse.isSuccessful()) {
adminAccount = approveResponse.body(); adminAccount = approveResponse.body();
} else {
Log.v(Helper.TAG, "err: " + approveResponse.errorBody().string());
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -342,10 +346,13 @@ public class AdminVM extends AndroidViewModel {
AdminAccount adminAccount = null; AdminAccount adminAccount = null;
Call<AdminAccount> unsuspendCall = mastodonAdminService.unsuspend(token, accountId); Call<AdminAccount> unsuspendCall = mastodonAdminService.unsuspend(token, accountId);
if (unsuspendCall != null) { if (unsuspendCall != null) {
Log.v(Helper.TAG, "request: " + unsuspendCall.request());
try { try {
Response<AdminAccount> unsuspendResponse = unsuspendCall.execute(); Response<AdminAccount> unsuspendResponse = unsuspendCall.execute();
if (unsuspendResponse.isSuccessful()) { if (unsuspendResponse.isSuccessful()) {
adminAccount = unsuspendResponse.body(); adminAccount = unsuspendResponse.body();
} else {
Log.v(Helper.TAG, "err: " + unsuspendResponse.errorBody().string());
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

1
app/src/main/res/layout/drawer_list.xml
View file

@ -10,5 +10,6 @@
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/cyanea_accent_dark_reference" android:textColor="@color/cyanea_accent_dark_reference"
app:icon="@drawable/ic_baseline_navigate_next_24" app:icon="@drawable/ic_baseline_navigate_next_24"
app:iconTint="@color/cyanea_accent_dark_reference"
app:iconGravity="end" app:iconGravity="end"
app:strokeColor="@color/cyanea_accent_dark_reference" /> app:strokeColor="@color/cyanea_accent_dark_reference" />