Commit 14685492 authored by cyberta's avatar cyberta
Browse files

clean up and show milliseconds in timestamps

parent 49f1f92e
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="deploymentTargetDropDown">
    <runningDeviceTargetSelectedWithDropDown>
      <Target>
        <type value="RUNNING_DEVICE_TARGET" />
        <deviceKey>
          <Key>
            <type value="SERIAL_NUMBER" />
            <value value="LGH8507d6f869b" />
          </Key>
        </deviceKey>
      </Target>
    </runningDeviceTargetSelectedWithDropDown>
    <timeTargetWasSelectedWithDropDown value="2022-02-16T22:41:20.375263Z" />
  </component>
</project>
 No newline at end of file
+0 −6
Original line number Diff line number Diff line
package org.torproject.artitoyvpn.ui.logging;

import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -13,7 +11,6 @@ import android.view.ViewGroup;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -23,9 +20,6 @@ import org.torproject.artitoyvpn.R;
import org.torproject.artitoyvpn.databinding.FragmentLogBinding;
import org.torproject.artitoyvpn.utils.Utils;

import java.io.File;
import java.util.Locale;

public class LogFragment extends Fragment {

    private FragmentLogBinding binding;
+0 −8
Original line number Diff line number Diff line
package org.torproject.artitoyvpn.ui.logging;

import android.text.format.DateFormat;

import org.torproject.artitoyvpn.utils.Utils;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;

public class LogItem {
    public final String content;
    public final String timestamp;
+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class Utils {
    }

    public static String getFormattedDate(long timestamp, Locale locale) {
        SimpleDateFormat sdf = new SimpleDateFormat("hh:mm:ss", locale);
        SimpleDateFormat sdf = new SimpleDateFormat("hh:mm:ss:SSS", locale);
        return sdf.format(timestamp);
    }

+11 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
</module>
 No newline at end of file