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

Some bug fixes

This commit is contained in:
stom79 2018-08-16 15:26:39 +02:00
parent c2143097f6
commit d9334434a6
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceHealthActivity.java
View File

@ -192,7 +192,8 @@ public class InstanceHealthActivity extends BaseActivity {
up.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.red)); up.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.red));
} }
uptime.setText(String.format("Uptime: %.2f %%", (instanceSocial.getUptime()*100))); uptime.setText(String.format("Uptime: %.2f %%", (instanceSocial.getUptime()*100)));
checked_at.setText(String.format("Checked at: %s", Helper.dateToString(instanceSocial.getChecked_at()))); if( instanceSocial.getChecked_at() != null)
checked_at.setText(String.format("Checked at: %s", Helper.dateToString(instanceSocial.getChecked_at())));
values.setText(String.format("version: %s \n %s users - %s statuses", instanceSocial.getVersion(), withSuffix(instanceSocial.getUsers()), withSuffix(instanceSocial.getStatuses()))); values.setText(String.format("version: %s \n %s users - %s statuses", instanceSocial.getVersion(), withSuffix(instanceSocial.getUsers()), withSuffix(instanceSocial.getStatuses())));
instance_container.setVisibility(View.VISIBLE); instance_container.setVisibility(View.VISIBLE);
loader.setVisibility(View.GONE); loader.setVisibility(View.GONE);

2
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -498,6 +498,8 @@ public class Helper {
* @return String * @return String
*/ */
public static String dateToString(Date date) { public static String dateToString(Date date) {
if( date == null)
return null;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",Locale.getDefault()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",Locale.getDefault());
return dateFormat.format(date); return dateFormat.format(date);
} }

22
app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
View File

@ -80,22 +80,26 @@ public class NotificationsSyncJob extends Job {
} }
public static int schedule(boolean updateCurrent){ public static int schedule(boolean updateCurrent) {
Set<JobRequest> jobRequests = JobManager.instance().getAllJobRequestsForTag(NOTIFICATION_REFRESH); Set<JobRequest> jobRequests = JobManager.instance().getAllJobRequestsForTag(NOTIFICATION_REFRESH);
if (!jobRequests.isEmpty() && !updateCurrent) { if (!jobRequests.isEmpty() && !updateCurrent) {
return jobRequests.iterator().next().getJobId(); return jobRequests.iterator().next().getJobId();
} }
return new JobRequest.Builder(NotificationsSyncJob.NOTIFICATION_REFRESH) int jobRequestschedule = -1;
.setPeriodic(TimeUnit.MINUTES.toMillis(Helper.MINUTES_BETWEEN_NOTIFICATIONS_REFRESH), TimeUnit.MINUTES.toMillis(5)) try {
.setUpdateCurrent(updateCurrent) jobRequestschedule = new JobRequest.Builder(NotificationsSyncJob.NOTIFICATION_REFRESH)
.setRequiredNetworkType(JobRequest.NetworkType.METERED) .setPeriodic(TimeUnit.MINUTES.toMillis(Helper.MINUTES_BETWEEN_NOTIFICATIONS_REFRESH), TimeUnit.MINUTES.toMillis(5))
.setRequirementsEnforced(false) .setUpdateCurrent(updateCurrent)
.build() .setRequiredNetworkType(JobRequest.NetworkType.METERED)
.schedule(); .setRequirementsEnforced(false)
} .build()
.schedule();
}catch (Exception ignored){}
return jobRequestschedule;
}
/** /**