Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Records home logs

This commit is contained in:
Thomas 2023-03-06 17:36:57 +01:00
parent e1c833fcd6
commit 84814d3291
6 changed files with 308 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View File

@ -164,6 +164,7 @@ import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
import app.fedilab.android.mastodon.client.entities.app.StatusCache;
import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.mastodon.client.entities.app.TimelineCacheLogs;
import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.mastodon.helper.CrossActionHelper;
import app.fedilab.android.mastodon.helper.Helper;
@ -350,6 +351,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
}
//Delete cache older than 7 days
new StatusCache(activity).deleteForAllAccountAfter7Days();
new TimelineCacheLogs(activity).deleteForAllAccountAfter7Days();
} catch (DBException e) {
e.printStackTrace();
}

245
app/src/main/java/app/fedilab/android/mastodon/activities/CheckHomeCacheActivity.java
View File

@ -15,6 +15,7 @@ package app.fedilab.android.mastodon.activities;
* see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.mastodon.helper.Helper.dateDiffFull;
import static app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM.sortAsc;
import android.content.Context;
@ -24,10 +25,17 @@ import android.view.View;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.github.mikephil.charting.components.Description;
import com.github.mikephil.charting.components.Legend;
import com.github.mikephil.charting.components.MarkerView;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.CombinedData;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
@ -49,6 +57,7 @@ import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.databinding.ActivityCheckHomeCachetBinding;
import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.mastodon.client.entities.app.StatusCache;
import app.fedilab.android.mastodon.client.entities.app.TimelineCacheLogs;
import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.mastodon.helper.ThemeHelper;
import es.dmoral.toasty.Toasty;
@ -59,10 +68,15 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
private ActivityCheckHomeCachetBinding binding;
private List<Status> statuses;
private List<TimelineCacheLogs> timelineCacheLogsList;
private List<Status> statusesDay;
private List<TimelineCacheLogs> timelineCacheLogsDayList;
private ArrayList<String> xVals;
private ArrayList<String> xVals2;
private List<TimelineCacheLogs> timelineCacheLogsListToAnalyse;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -78,12 +92,16 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
return;
}
drawCacheGraph(range.ALL);
binding.chartToggle.setOnCheckedChangeListener((compoundButton, checked) -> drawCacheGraph(checked ? range.DAY : range.ALL));
drawCacheLogsGraph(range.ALL);
binding.chartToggle.setOnCheckedChangeListener((compoundButton, checked) -> {
drawCacheGraph(checked ? range.DAY : range.ALL);
drawCacheLogsGraph(checked ? range.DAY : range.ALL);
});
}
private void drawCacheGraph(range myRange) {
binding.chartContainer.setVisibility(View.GONE);
binding.progress.setVisibility(View.VISIBLE);
binding.chartToggle.setEnabled(false);
new Thread(() -> {
try {
if (myRange == range.ALL) {
@ -104,11 +122,11 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
}
}
if ((statuses == null || statuses.size() < 2) && myRange == range.ALL) {
runOnUiThread(() -> binding.noAction.setVisibility(View.VISIBLE));
runOnUiThread(() -> binding.chartToggle.setEnabled(true));
return;
}
if ((statusesDay == null || statusesDay.size() < 2) && myRange == range.DAY) {
runOnUiThread(() -> binding.noAction.setVisibility(View.VISIBLE));
runOnUiThread(() -> binding.chartToggle.setEnabled(true));
return;
}
@ -156,9 +174,8 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
}
runOnUiThread(() -> {
binding.chartToggle.setEnabled(true);
binding.progress.setVisibility(View.GONE);
binding.chartContainer.setVisibility(View.VISIBLE);
//We loop through cache
List<Entry> statusEntry = new ArrayList<>();
@ -215,7 +232,171 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
} catch (DBException | NegativeArraySizeException e) {
binding.noAction.setVisibility(View.VISIBLE);
Toasty.error(this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
throw new RuntimeException(e);
}
}).start();
}
private void drawCacheLogsGraph(range myRange) {
binding.progress2.setVisibility(View.VISIBLE);
new Thread(() -> {
xVals2 = new ArrayList<>();
try {
if (myRange == range.ALL) {
if (timelineCacheLogsList == null) {
timelineCacheLogsList = new TimelineCacheLogs(this).getHome(MainActivity.currentAccount);
}
} else if (myRange == range.DAY) {
if (timelineCacheLogsDayList == null && timelineCacheLogsList != null) {
timelineCacheLogsDayList = new ArrayList<>();
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_YEAR, -1);
for (TimelineCacheLogs timelineCacheLogs : timelineCacheLogsList) {
if (timelineCacheLogs.created_at.after(calendar.getTime())) {
timelineCacheLogsDayList.add(timelineCacheLogs);
}
}
}
}
if ((timelineCacheLogsList == null || timelineCacheLogsList.size() < 2) && myRange == range.ALL) {
return;
}
if ((timelineCacheLogsDayList == null || timelineCacheLogsDayList.size() < 2) && myRange == range.DAY) {
return;
}
timelineCacheLogsListToAnalyse = new ArrayList<>();
if (myRange == range.ALL) {
timelineCacheLogsListToAnalyse.addAll(timelineCacheLogsList);
} else {
timelineCacheLogsListToAnalyse.addAll(timelineCacheLogsDayList);
}
List<BarEntry> failEntry = new ArrayList<>();
List<Entry> updateEntry = new ArrayList<>();
List<Entry> insertEntry = new ArrayList<>();
List<Entry> frequencyEntry = new ArrayList<>();
List<Entry> fetchedEntry = new ArrayList<>();
int inc = 0;
for (TimelineCacheLogs timelineCacheLogs : timelineCacheLogsListToAnalyse) {
//X-Axis
SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
String xDate = df.format(timelineCacheLogs.created_at);
xVals2.add(xDate);
//Entries
failEntry.add(new BarEntry(inc, timelineCacheLogs.failed));
updateEntry.add(new Entry(inc, timelineCacheLogs.updated));
insertEntry.add(new Entry(inc, timelineCacheLogs.inserted));
frequencyEntry.add(new Entry(inc, timelineCacheLogs.frequency));
fetchedEntry.add(new Entry(inc, timelineCacheLogs.fetched));
inc++;
}
runOnUiThread(() -> {
binding.progress2.setVisibility(View.GONE);
LineData lineData = new LineData();
BarData barDataFailed = new BarData();
BarDataSet dataFailed = new BarDataSet(failEntry, getString(R.string.fails));
LineDataSet dataNewMessage = new LineDataSet(insertEntry, getString(R.string.new_messages));
LineDataSet dataUpdatedMessage = new LineDataSet(updateEntry, getString(R.string.updated_messages));
LineDataSet dataFrequency = new LineDataSet(frequencyEntry, getString(R.string.frequency_minutes));
LineDataSet dataFetched = new LineDataSet(fetchedEntry, getString(R.string.total_fetched));
dataFailed.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.errorColor));
dataFailed.setDrawValues(false);
dataFailed.setAxisDependency(YAxis.AxisDependency.RIGHT);
barDataFailed.addDataSet(dataFailed);
dataNewMessage.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_1));
dataNewMessage.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
dataNewMessage.setDrawValues(false);
dataNewMessage.setDrawFilled(true);
dataNewMessage.setDrawCircles(false);
dataNewMessage.setDrawCircleHole(false);
dataNewMessage.setAxisDependency(YAxis.AxisDependency.LEFT);
dataNewMessage.setMode(LineDataSet.Mode.CUBIC_BEZIER);
lineData.addDataSet(dataNewMessage);
dataUpdatedMessage.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_2));
dataUpdatedMessage.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
dataUpdatedMessage.setDrawValues(false);
dataUpdatedMessage.setDrawFilled(true);
dataUpdatedMessage.setDrawCircles(false);
dataUpdatedMessage.setDrawCircleHole(false);
dataUpdatedMessage.setAxisDependency(YAxis.AxisDependency.LEFT);
dataUpdatedMessage.setMode(LineDataSet.Mode.CUBIC_BEZIER);
lineData.addDataSet(dataUpdatedMessage);
dataFrequency.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_3));
dataFrequency.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
dataFrequency.setDrawValues(false);
dataFrequency.setDrawFilled(true);
dataFrequency.setDrawCircles(false);
dataFrequency.setDrawCircleHole(false);
dataFrequency.setAxisDependency(YAxis.AxisDependency.LEFT);
dataFrequency.setMode(LineDataSet.Mode.CUBIC_BEZIER);
lineData.addDataSet(dataFrequency);
dataFetched.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_4));
dataFetched.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
dataFetched.setDrawValues(false);
dataFetched.setDrawFilled(true);
dataFetched.setDrawCircles(false);
dataFetched.setDrawCircleHole(false);
dataFetched.setAxisDependency(YAxis.AxisDependency.LEFT);
dataFetched.setMode(LineDataSet.Mode.CUBIC_BEZIER);
lineData.addDataSet(dataFetched);
CombinedData data = new CombinedData();
data.setData(barDataFailed);
data.setData(lineData);
binding.chart2.setData(data);
IndexAxisValueFormatter formatter = new IndexAxisValueFormatter() {
@Override
public String getFormattedValue(float value) {
if (value < xVals2.size()) {
return xVals2.get((int) value);
} else
return "";
}
};
binding.chart2.setExtraBottomOffset(80);
// binding.chart.getXAxis().setGranularity(1f);
binding.chart2.getXAxis().setPosition(XAxis.XAxisPosition.BOTTOM);
binding.chart2.getXAxis().setLabelRotationAngle(-45f);
binding.chart2.getXAxis().setValueFormatter(formatter);
binding.chart2.getXAxis().setEnabled(true);
binding.chart2.getXAxis().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
binding.chart2.getAxisLeft().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
binding.chart2.getAxisRight().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
binding.chart2.getLegend().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
binding.chart2.getAxisLeft().setAxisMinimum(0f);
binding.chart2.getAxisRight().setAxisMinimum(0f);
binding.chart2.getXAxis().setLabelCount(10, true);
binding.chart2.getLegend().setEnabled(true);
binding.chart2.getLegend().setOrientation(Legend.LegendOrientation.HORIZONTAL);
binding.chart2.getLegend().setVerticalAlignment(Legend.LegendVerticalAlignment.BOTTOM);
binding.chart2.getLegend().setDrawInside(false);
binding.chart2.getLegend().setWordWrapEnabled(true);
binding.chart2.setTouchEnabled(true);
Description description = binding.chart2.getDescription();
description.setEnabled(true);
CustomMarkerView2 mv = new CustomMarkerView2(CheckHomeCacheActivity.this, R.layout.custom_marker_view_layout);
binding.chart2.setMarkerView(mv);
binding.chart2.invalidate();
});
} catch (DBException | NegativeArraySizeException e) {
Toasty.error(this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
throw new RuntimeException(e);
}
@ -227,6 +408,7 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
DAY
}
public static class GraphElement {
String dateLabel;
int count;
@ -285,4 +467,51 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
}
}
public class CustomMarkerView2 extends MarkerView {
private final TextView tvContent;
private MPPointF mOffset;
public CustomMarkerView2(Context context, int layoutResource) {
super(context, layoutResource);
// find your layout components
tvContent = findViewById(R.id.tvContent);
}
// callbacks everytime the MarkerView is redrawn, can be used to update the
// content (user-interface)
@Override
public void refreshContent(Entry e, Highlight highlight) {
if (xVals2.size() > (int) e.getX()) {
if (timelineCacheLogsListToAnalyse != null && (int) e.getX() < timelineCacheLogsListToAnalyse.size()) {
String text = getString(R.string.fail_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).failed) + "\r\n";
text += getString(R.string.fetched_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).fetched) + "\r\n";
text += getString(R.string.inserted_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).inserted) + "\r\n";
text += getString(R.string.updated_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).updated) + "\r\n";
text += getString(R.string.frequency_count_minutes, timelineCacheLogsListToAnalyse.get((int) e.getX()).frequency) + "\r\n\r\n";
text += dateDiffFull(timelineCacheLogsListToAnalyse.get((int) e.getX()).created_at);
tvContent.setText(text);
} else {
tvContent.setText(getString(R.string.messages, (int) e.getY()) + "\r\n" + xVals2.get((int) e.getX()));
}
}
// this will perform necessary layouting
super.refreshContent(e, highlight);
}
@Override
public MPPointF getOffset() {
if (mOffset == null) {
// center the marker horizontally and vertically
mOffset = new MPPointF(-(int) (getWidth() / 2), -getHeight());
}
return mOffset;
}
}
}

2
app/src/main/java/app/fedilab/android/mastodon/client/entities/app/TimelineCacheLogs.java
View File

@ -83,7 +83,7 @@ public class TimelineCacheLogs {
}
String selection = Sqlite.COL_INSTANCE + "='" + baseAccount.instance + "' AND " + Sqlite.COL_USER_ID + "= '" + baseAccount.user_id + "' AND " + Sqlite.COL_SLUG + "= '" + Timeline.TimeLineEnum.HOME.getValue() + "' ";
try {
Cursor c = db.query(Sqlite.TABLE_TIMELINE_CACHE_LOGS, null, selection, null, Sqlite.COL_STATUS_ID, null, Sqlite.COL_STATUS_ID + " ASC", null);
Cursor c = db.query(Sqlite.TABLE_TIMELINE_CACHE_LOGS, null, selection, null, null, null, Sqlite.COL_ID + " ASC", null);
return cursorToListOfStatuses(c);
} catch (Exception e) {
e.printStackTrace();

76
app/src/main/res/layouts/mastodon/layout/activity_check_home_cachet.xml
View File

@ -19,6 +19,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_marginHorizontal="6dp"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
@ -52,7 +53,6 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:visibility="gone"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -65,36 +65,72 @@
android:layout_height="match_parent" />
</androidx.appcompat.widget.LinearLayoutCompat>
<ProgressBar
<RelativeLayout
android:id="@+id/progress"
app:layout_constraintBottom_toBottomOf="@+id/chart_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:visibility="gone"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/chart_container"
app:layout_constraintTop_toBottomOf="@+id/chart_toggle"
tools:visibility="visible">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:indeterminate="true" />
</RelativeLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_chart2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:indeterminate="true" />
android:layout_height="wrap_content"
android:text="@string/chart_home_cache_logs"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/chart_container" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/chart_container2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="20dp"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_chart2"
tools:visibility="visible">
<com.github.mikephil.charting.charts.CombinedChart
android:id="@+id/chart2"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:id="@+id/no_action"
android:id="@+id/progress2"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="@+id/chart_container"
android:layout_height="0dp"
android:layout_marginTop="20dp"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toBottomOf="@+id/title_chart2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/chart_container"
tools:visibility="visible"
android:visibility="gone">
<TextView
android:id="@+id/no_action_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:padding="10dp"
android:text="@string/no_cached_messages"
android:textSize="20sp" />
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:indeterminate="true" />
</RelativeLayout>

2
app/src/main/res/layouts/mastodon/layout/custom_marker_view_layout.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_height="wrap_content"
android:background="@color/black">
<TextView

11
app/src/main/res/layouts/mastodon/values/strings.xml
View File

@ -2,6 +2,17 @@
<resources>
<string name="chart_home_cache_logs">Home cache logs</string>
<string name="chart_home_cache">Home cache records per hour</string>
<string name="last_24_h">Last 24 hours</string>
<string name="fails">Fails</string>
<string name="new_messages">New messages</string>
<string name="updated_messages">Updated messages</string>
<string name="frequency_minutes">Frequency (minutes)</string>
<string name="total_fetched">Total of fetched messages</string>
<string name="fail_count">%d fails</string>
<string name="fetched_count">%d fetched messages</string>
<string name="inserted_count">%d new messages</string>
<string name="updated_count">%d updated messages</string>
<string name="frequency_count_minutes">%d frequency (minutes)</string>
</resources>