ANDROID: fix webui date column handling

Author: chrisws

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/WebServer.java

@@ -11,7 +11,10 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URLDecoder;
-import java.text.DateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -250,9 +253,9 @@ public FileData(String fileName, String date, long size) {
     }
 
     public FileData(File file) {
-      DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.DEFAULT);
+      ZonedDateTime zonedDateTime = Instant.ofEpochMilli(file.lastModified()).atZone(ZoneId.of("UTC"));
       this.fileName = file.getName();
-      this.date = dateFormat.format(file.lastModified());
+      this.date = DateTimeFormatter.RFC_1123_DATE_TIME.format(zonedDateTime);
       this.size = file.length();
     }
   }
@@ -321,7 +324,7 @@ public void run() {
             log("Invalid request");
           }
         }
-      } catch (IOException e) {
+      } catch (Exception e) {
         log("Request failed", e);
       }
       finally {

src/platform/android/webui/server/src/main/java/net/sourceforge/smallbasic/Server.java

@@ -4,22 +4,26 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
-import java.text.DateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Objects;
 
 public class Server {
   private static final String BASIC_HOME = "../basic/";
 
-  public static void main(String[] args ) {
+  public static void main(String[] args ) throws IOException {
+
+
     // ln -s ../../../../../../../../app/src/main/java/net/sourceforge/smallbasic/WebServer.java .
     WebServer webServer = new WebServer() {
       @Override
@@ -41,9 +45,9 @@ protected Collection<FileData> getFileData() throws IOException {
           BasicFileAttributes attr = Files.readAttributes(fileEntry.toPath(), BasicFileAttributes.class);
           if (!attr.isDirectory()) {
             FileTime lastModifiedTime = attr.lastModifiedTime();
-            DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.DEFAULT);
             String fileName = fileEntry.getName();
-            String date = dateFormat.format(lastModifiedTime.toMillis());
+            ZonedDateTime zonedDateTime = Instant.ofEpochMilli(lastModifiedTime.toMillis()).atZone(ZoneId.of("UTC"));
+            String date = DateTimeFormatter.RFC_1123_DATE_TIME.format(zonedDateTime);
             long size = attr.size();
             result.add(new FileData(fileName, date, size));
           }

src/platform/android/webui/src/App.js

@@ -49,7 +49,11 @@ const columns = [{
 }, {
   field: 'date',
   headerName: 'Modified',
-  type: 'number',
+  type: 'date',
+  minWidth: 110,
+  renderCell: (params) => {
+    return new Date(params.row.date).toLocaleDateString();
+  }
 }];
 
 function getFetchHeader(body) {
@@ -227,10 +231,17 @@ function FileList(props) {
     rows: props.rows
   };
 
+  const sorting = {
+    sorting: {
+      sortModel: [{ field: 'fileName', sort: 'asc' }],
+    },
+  };
+
   return (
     <Fragment>
       <ErrorMessage error={error} setError={setError} />
       <DataGrid rows={props.rows}
+                initialState={sorting}
                 columns={columns}
                 onCellEditCommit={(params) => onCellEditCommit(props, params, setError)}
                 autoPageSize