Commit 941dd215 authored by Thomas's avatar Thomas
Browse files

Some changes

parent aff9d093

app/src/main/java/app/fedilab/android/client/entities/misskey/MisskeyNote.java

+5 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class MisskeyNote implements Serializable { 
    @SerializedName("emojis")

    public List<MisskeyEmoji> emojis;



    public static Status convert(MisskeyNote misskeyNote) {

    public static Status convert(MisskeyNote misskeyNote, String instance) {

        Status status = new Status();

        status.id = misskeyNote.id;

        status.in_reply_to_id = misskeyNote.replyId;
@@ -64,7 +64,10 @@ public class MisskeyNote implements Serializable { 
        status.spoiler_text = misskeyNote.cw;

        status.visibility = misskeyNote.visibility;

        status.created_at = misskeyNote.createdAt;

        status.uri = misskeyNote.uri;

        if (misskeyNote.url == null) {

            misskeyNote.url = "https://" + instance + "/notes/" + misskeyNote.id;

        }

        status.uri = misskeyNote.uri != null ? misskeyNote.uri : misskeyNote.url;

        status.url = misskeyNote.url;



        Account account = new Account();

app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class CrossActionHelper { 
                        }

                    });

        } else if (targetedStatus != null) {

            searchVM.search(ownerAccount.instance, ownerAccount.token, targetedStatus.url, null, "statuses", false, true, false, 0, null, null, 1)

            searchVM.search(ownerAccount.instance, ownerAccount.token, targetedStatus.uri, null, "statuses", false, true, false, 0, null, null, 1)

                    .observe((LifecycleOwner) context, results -> {

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

                            Status status = results.statuses.get(0);

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+12 −12
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            holder.binding.actionButtonBookmark.setOnClickListener(v -> {

                if (remote) {

                    Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                            .observe((LifecycleOwner) context, results -> {

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

                                    Status fetchedStatus = statusList.get(0);
@@ -545,7 +545,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            holder.binding.statusUserInfo.setOnClickListener(v -> {

                if (remote) {

                    Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                            .observe((LifecycleOwner) context, results -> {

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

                                    Status fetchedStatus = results.statuses.get(0);
@@ -575,7 +575,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            holder.binding.statusBoosterAvatar.setOnClickListener(v -> {

                if (remote) {

                    Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                            .observe((LifecycleOwner) context, results -> {

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

                                    Status fetchedStatus = results.statuses.get(0);
@@ -621,7 +621,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> {

                        if (remote) {

                            Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                            searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                            searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                                    .observe((LifecycleOwner) context, results -> {

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

                                            Status fetchedStatus = results.statuses.get(0);
@@ -649,7 +649,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                } else {

                    if (remote) {

                        Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                                .observe((LifecycleOwner) context, results -> {

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

                                        Status fetchedStatus = results.statuses.get(0);
@@ -691,7 +691,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> {

                        if (remote) {

                            Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                            searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                            searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                                    .observe((LifecycleOwner) context, results -> {

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

                                            Status fetchedStatus = results.statuses.get(0);
@@ -719,7 +719,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                } else {

                    if (remote) {

                        Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                                .observe((LifecycleOwner) context, results -> {

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

                                        Status fetchedStatus = results.statuses.get(0);
@@ -1094,7 +1094,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        holder.binding.reblogInfo.setOnClickListener(v -> {

            if (remote) {

                Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                        .observe((LifecycleOwner) context, results -> {

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

                                Status fetchedStatus = results.statuses.get(0);
@@ -1121,7 +1121,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        holder.binding.favouriteInfo.setOnClickListener(v -> {

            if (remote) {

                Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                        .observe((LifecycleOwner) context, results -> {

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

                                Status fetchedStatus = results.statuses.get(0);
@@ -1254,7 +1254,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    //Vote on the poll

                    if (remote) {

                        Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                                .observe((LifecycleOwner) context, results -> {

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

                                        Status fetchedStatus = results.statuses.get(0);
@@ -1336,7 +1336,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                } else {

                    if (remote) {

                        Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                        searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                                .observe((LifecycleOwner) context, results -> {

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

                                        Status fetchedStatus = results.statuses.get(0);
@@ -1627,7 +1627,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        holder.binding.actionButtonReply.setOnClickListener(v -> {

            if (remote) {

                Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();

                searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.url, null, "statuses", false, true, false, 0, null, null, 1)

                searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)

                        .observe((LifecycleOwner) context, results -> {

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

                                Status fetchedStatus = statusList.get(0);

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java

+0 −19
Original line number Diff line number Diff line
@@ -14,17 +14,14 @@ package app.fedilab.android.ui.fragment.timeline; 
 * You should have received a copy of the GNU General Public License along with Fedilab; if not,

 * see <http://www.gnu.org/licenses>. */



import android.app.NotificationManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.service.notification.StatusBarNotification;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -178,22 +175,6 @@ public class FragmentMastodonNotification extends Fragment implements Notificati 
    }





    @Override

    public void onResume() {

        super.onResume();

        NotificationManager mNotificationManager = (NotificationManager) requireActivity().getSystemService(Context.NOTIFICATION_SERVICE);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && BaseMainActivity.currentAccount != null && BaseMainActivity.currentAccount.mastodon_account != null) {

            for (StatusBarNotification statusBarNotification : mNotificationManager.getActiveNotifications()) {

                if ((BaseMainActivity.currentAccount.mastodon_account.acct + "@" + BaseMainActivity.currentAccount.instance).equals(statusBarNotification.getGroupKey())) {

                    mNotificationManager.cancel(statusBarNotification.getId());

                }

            }

        } else {

            mNotificationManager.cancelAll();

        }

    }





    /**

     * Intialize the view for notifications

     *

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java

+0 −6
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.view.View; 
import android.view.ViewGroup;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -188,11 +187,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 
        }

    }



    @Override

    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

    }



    public View onCreateView(@NonNull LayoutInflater inflater,

                             ViewGroup container, Bundle savedInstanceState) {