Commit f41061c2 authored by Alexander Hansen Færøy's avatar Alexander Hansen Færøy
Browse files

Merge branch 'invert_log_list' into 'main' 

invert log list order. newest entry at the top of the list

See merge request tpo/core/onionmasq!3
parents 9d7c3f05 3771bae9

android/ArtiToyVPN/app/src/main/java/org/torproject/artitoyvpn/ui/logging/LogObservable.java

+7 −7
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ import androidx.lifecycle.ViewModel; 


import org.torproject.artitoyvpn.utils.Utils;



import java.util.ArrayList;

import java.util.LinkedList;

import java.util.Locale;



public class LogObservable extends ViewModel {



    private final MutableLiveData<ArrayList<LogItem>> logListData;

    private final MutableLiveData<LinkedList<LogItem>> logListData;

    private static LogObservable instance;



    private LogObservable() {

        logListData = new MutableLiveData<>(new ArrayList<>());

        logListData = new MutableLiveData<>(new LinkedList<>());

    }



    public static LogObservable getInstance() {
@@ -26,9 +26,9 @@ public class LogObservable extends ViewModel { 
    }



    public void addLog(String log) {

        ArrayList<LogItem> list = logListData.getValue();

        LinkedList<LogItem> list = logListData.getValue();

        if (list != null) {

            list.add(new LogItem(Utils.getFormattedDate(System.currentTimeMillis(), Locale.getDefault()), log));

            list.addFirst(new LogItem(Utils.getFormattedDate(System.currentTimeMillis(), Locale.getDefault()), log));

            logListData.postValue(list);

        }

    }
@@ -36,7 +36,7 @@ public class LogObservable extends ViewModel { 


    public String getLogStrings(boolean showTimestamp) {

        StringBuilder builder = new StringBuilder();

        ArrayList<LogItem> logItemArrayList = logListData.getValue();

        LinkedList<LogItem> logItemArrayList = logListData.getValue();

        if (logItemArrayList == null) {

            return "";

        }
@@ -46,7 +46,7 @@ public class LogObservable extends ViewModel { 
        return builder.toString();

    }



    public LiveData<ArrayList<LogItem>> getLogListData() {

    public LiveData<LinkedList<LogItem>> getLogListData() {

        return logListData;

    }

android/ArtiToyVPN/app/src/main/java/org/torproject/artitoyvpn/ui/logging/LogRecyclerViewAdapter.java

+5 −5
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; 


import org.torproject.artitoyvpn.databinding.LogItemBinding;



import java.util.ArrayList;

import java.util.Locale;

import java.util.LinkedList;





/**
@@ -20,10 +19,10 @@ public class LogRecyclerViewAdapter extends RecyclerView.Adapter<LogRecyclerView 


    private static final String TAG = LogRecyclerViewAdapter.class.getName();

    private boolean showTimestamps = true;

    private ArrayList<LogItem> logItems;

    private LinkedList<LogItem> logItems;



    public LogRecyclerViewAdapter() {

        logItems = new ArrayList<>();

        logItems = new LinkedList<>();

    }



    public void setShowTimeStamps(boolean show) {
@@ -57,8 +56,9 @@ public class LogRecyclerViewAdapter extends RecyclerView.Adapter<LogRecyclerView 
        return logItems.size();

    }



    public void updateList(ArrayList<LogItem> list) {

    public void updateList(LinkedList<LogItem> list) {

        this.logItems = list;

        notifyDataSetChanged();

    }



    public static class ViewHolder extends RecyclerView.ViewHolder {