Commit c6bd8ac2 authored by Thomas's avatar Thomas
Browse files

Add new endpoints and fix migration to v2

parent e32b3bf6

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

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import androidx.recyclerview.widget.LinearLayoutManager; 
import java.util.ArrayList;



import app.fedilab.android.R;

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

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

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

import app.fedilab.android.client.entities.api.admin.AdminAccount;

import app.fedilab.android.client.entities.api.admin.AdminReport;

import app.fedilab.android.databinding.ActivityAdminReportBinding;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.ThemeHelper;

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

+1 −1
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ import java.util.concurrent.TimeUnit; 


import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;

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

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

import app.fedilab.android.client.entities.api.admin.AdminAccount;

import app.fedilab.android.databinding.ActivityAdminAccountBinding;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

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

+1 −1
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ import java.util.concurrent.TimeUnit; 
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.AdminAccount;

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

import app.fedilab.android.client.entities.api.admin.AdminAccount;

import app.fedilab.android.databinding.ActivityAdminAccountBinding;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonAdminService.java

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ package app.fedilab.android.client.endpoints; 


import java.util.List;



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

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

import app.fedilab.android.client.entities.api.admin.AdminAccount;

import app.fedilab.android.client.entities.api.admin.AdminReport;

import retrofit2.Call;

import retrofit2.http.Field;

import retrofit2.http.FormUrlEncoded;

app/src/main/java/app/fedilab/android/client/entities/api/AdminAccount.java→app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccount.java

+4 −9
Original line number Diff line number Diff line 
package app.fedilab.android.client.entities.api;

package app.fedilab.android.client.entities.api.admin;

/* Copyright 2021 Thomas Schneider

 *

 * This file is a part of Fedilab
@@ -21,6 +21,8 @@ import java.util.Date; 
import java.util.LinkedHashMap;

import java.util.List;



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



public class AdminAccount implements Serializable {



    @SerializedName("id")
@@ -74,7 +76,7 @@ public class AdminAccount implements Serializable { 
    @SerializedName("approved")

    public boolean approved;

    @SerializedName("ips")

    public List<IP> ips;

    public List<AdminIp> ips;

    @SerializedName("account")

    public Account account;

    @SerializedName("created_by_application_id")
@@ -83,13 +85,6 @@ public class AdminAccount implements Serializable { 
    public String invited_by_account_id;





    public static class IP implements Serializable {

        @SerializedName("ip")

        public String ip;

        @SerializedName("used_at")

        public Date used_at;

    }



    @SerializedName("locale")

    public String locale;

    @SerializedName("invite_request")