mirror of
https://codeberg.org/tom79/Fedilab.git
synced 2024-12-22 16:50:04 +02:00
Some fixes
This commit is contained in:
parent
2687f85935
commit
9a08f5eb5f
3 changed files with 14 additions and 4 deletions
|
@ -16,6 +16,7 @@ package app.fedilab.android.mastodon.activities;
|
|||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dateDiffFull;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dateDiffFullShort;
|
||||
import static app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM.sortAsc;
|
||||
|
||||
import android.content.Context;
|
||||
|
@ -281,8 +282,8 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
|
|||
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);
|
||||
//X-Axis
|
||||
String xDate = dateDiffFullShort(timelineCacheLogs.created_at);
|
||||
xVals2.add(xDate);
|
||||
//Entries
|
||||
failEntry.add(new BarEntry(inc, timelineCacheLogs.failed));
|
||||
|
|
|
@ -1654,6 +1654,16 @@ public class Helper {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public static String dateDiffFullShort(Date dateToot) {
|
||||
SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault());
|
||||
try {
|
||||
return df.format(dateToot);
|
||||
} catch (Exception e) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes the tvDate TextView field clickable, and displays the absolute date & time of a toot
|
||||
* for 5 seconds.
|
||||
|
|
|
@ -41,7 +41,6 @@ import java.util.List;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.mastodon.client.endpoints.MastodonTimelinesService;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Pagination;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Status;
|
||||
|
@ -165,7 +164,7 @@ public class FetchHomeWorker extends Worker {
|
|||
|
||||
boolean failed = false;
|
||||
int fetched = 0, inserted = 0, updated = 0, frequency = 0;
|
||||
String timeRefresh = prefs.getString(context.getString(R.string.SET_FETCH_HOME_DELAY_VALUE) + MainActivity.currentUserID + MainActivity.currentInstance, "60");
|
||||
String timeRefresh = prefs.getString(context.getString(R.string.SET_FETCH_HOME_DELAY_VALUE) + account.user_id + account.instance, "60");
|
||||
try {
|
||||
frequency = Integer.parseInt(timeRefresh);
|
||||
} catch (Exception ignored) {
|
||||
|
|
Loading…
Reference in a new issue