Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c055722 authored by Rob Emery's avatar Rob Emery
Browse files

First stab at adding milliseconds-in-filename preference

parent a6673ade

app/src/main/java/net/sourceforge/opencamera/PreferenceKeys.java

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ public class PreferenceKeys { 


    public static final String SaveZuluTimePreferenceKey = "preference_save_zulu_time";



    public static final String SaveIncludeMillisecondsPreferenceKey = "preference_save_include_milliseconds";



    public static final String ShowZoomControlsPreferenceKey = "preference_show_zoom_controls";



    public static final String ShowZoomSliderControlsPreferenceKey = "preference_show_zoom_slider_controls";

app/src/main/java/net/sourceforge/opencamera/StorageUtils.java

+7 −2
Original line number Diff line number Diff line
@@ -696,14 +696,19 @@ public class StorageUtils { 
        }

        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);

        boolean useZuluTime = sharedPreferences.getString(PreferenceKeys.SaveZuluTimePreferenceKey, "local").equals("zulu");

        boolean includeMilliseconds = sharedPreferences.getString(PreferenceKeys.SaveIncludeMillisecondsPreferenceKey, "false").equals("true");

        String dateFormatPattern = "yyyyMMdd_HHmmss";

        if(includeMilliseconds) {

            dateFormatPattern += ".SSS";

        }

        String timeStamp;

        if( useZuluTime ) {

            SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd_HHmmss'Z'", Locale.US);

            SimpleDateFormat fmt = new SimpleDateFormat(dateFormatPattern+"'Z'", Locale.US);

            fmt.setTimeZone(TimeZone.getTimeZone("UTC"));

            timeStamp = fmt.format(current_date);

        }

        else {

            timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(current_date);

            timeStamp = new SimpleDateFormat(dateFormatPattern, Locale.US).format(current_date);

        }

        String mediaFilename;

        switch (type) {