Milestone 136 - trkseg bugfix, no motion heartbeat, http file upload target

fastlane/metadata/android/en-US/changelogs/136.txt

@@ -0,0 +1,3 @@
+* HTTP File Upload Target (separate from normal Custom URL logger).
+* Significant motion heartbeat interval setting for long durations.
+* Fixed bug where GPX track segments were not being created correctly.

gpslogger/build.gradle

@@ -45,8 +45,8 @@ android {
 
         targetSdkVersion 35
         compileSdk 35
-        versionCode 135
-        versionName "135"
+        versionCode 136
+        versionName "136-rc1"
 
         // Used by AppAuth-Android
         manifestPlaceholders = [

gpslogger/src/main/java/com/mendhak/gpslogger/GpsLoggingService.java

@@ -289,7 +289,7 @@ private void handleIntent(Intent intent) {
                     preferenceHelper.setPassiveFilterInterval(passiveFilterInterval);
                     needToStartGpsManager = true;
                 }
-                
+
                 if(bundle.get(IntentConstants.LOG_ONCE) != null){
                     boolean logOnceIntent = bundle.getBoolean(IntentConstants.LOG_ONCE);
                     LOG.debug("Intent received - Log Once: " + String.valueOf(logOnceIntent));
@@ -435,7 +435,9 @@ protected void startLogging() {
         showNotification();
         setupAutoSendTimers();
         setupSignificantMotionSensor();
-        resetCurrentFileName(true);
+
+        resetCurrentFileName(Strings.isNullOrEmpty(session.getCurrentFormattedFileName()));
+
         notifyClientsStarted(true);
         startPassiveManager();
         startGpsManager();
@@ -806,8 +808,19 @@ private boolean userHasBeenStillForTooLong() {
         if(!preferenceHelper.shouldLogOnlyIfSignificantMotion()){
             return false;
         }
-        return !session.hasDescription() && !session.isSinglePointMode() &&
+
+        boolean hasBeenStill = !session.hasDescription() && !session.isSinglePointMode() &&
                 (session.getUserStillSinceTimeStamp() > 0 && (System.currentTimeMillis() - session.getUserStillSinceTimeStamp()) > (preferenceHelper.getMinimumLoggingInterval() * 1000));
+
+        if (hasBeenStill && preferenceHelper.getSignificantMotionBypassInterval() >= 1) {
+            long bypassIntervalInMillis = preferenceHelper.getSignificantMotionBypassInterval() * 60 * 1000L;
+            if (System.currentTimeMillis() - session.getLatestTimeStamp() >= bypassIntervalInMillis) {
+                LOG.debug("Significant motion bypass interval passed, so let's allow a point to be logged.");
+                return false;
+            }
+        }
+
+        return hasBeenStill;
     }
 
     private void startAbsoluteTimer() {
@@ -1243,7 +1256,13 @@ private void setAlarmForNextPoint() {
      * @param loc Location object
      */
     private void writeToFile(Location loc) {
-        session.setAddNewTrackSegment(false);
+        //session.setAddNewTrackSegment(false);
+
+        if(FileLoggerFactory.getFileLoggers(getApplicationContext()).isEmpty()){
+            Systems.showErrorNotification(getApplicationContext(),
+                    String.format("%s %s", getString(R.string.summary_loggingto), getString(R.string.summary_loggingto_screen)));
+            return;
+        }
 
         try {
             LOG.debug("Calling file writers");
@@ -1259,6 +1278,7 @@ private void writeToFile(Location loc) {
              Systems.showErrorNotification(this, getString(R.string.could_not_write_to_file));
         }
 
+        session.setAddNewTrackSegment(false);
         session.clearDescription();
         EventBus.getDefault().post(new ServiceEvents.AnnotationStatus(true));
     }

gpslogger/src/main/java/com/mendhak/gpslogger/GpsMainActivity.java

@@ -846,6 +846,7 @@ public boolean onProfileLongClick(View view, final IProfile iProfile, boolean b)
 
         materialDrawer.addItem(GpsLoggerDrawerItem.newPrimary(R.string.pref_autosend_title, R.string.pref_autosend_summary, R.drawable.autosend, 1003));
         materialDrawer.addItem(GpsLoggerDrawerItem.newPrimary(R.string.log_customurl_setup_title, null, R.drawable.customurlsender, 1020));
+        materialDrawer.addItem(GpsLoggerDrawerItem.newPrimary(R.string.http_file_upload_setup_title, null, R.drawable.customurlsender, 1021));
         materialDrawer.addItem(GpsLoggerDrawerItem.newPrimary(R.string.dropbox_setup_title, null, R.drawable.dropbox, 1005));
         materialDrawer.addItem(GpsLoggerDrawerItem.newPrimary(R.string.google_drive_setup_title, null, R.drawable.googledrive, 1011));
         materialDrawer.addItem(GpsLoggerDrawerItem.newPrimary(R.string.sftp_setup_title, null, R.drawable.sftp, 1015));
@@ -905,6 +906,9 @@ public boolean onItemClick(View view, int i, IDrawerItem iDrawerItem) {
                     case 1020:
                         launchPreferenceScreen(MainPreferenceActivity.PREFERENCE_FRAGMENTS.CUSTOMURL);
                         break;
+                    case 1021:
+                        launchPreferenceScreen(MainPreferenceActivity.PREFERENCE_FRAGMENTS.HTTPFILEUPLOAD);
+                        break;
                     case 9000:
                         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://gpslogger.app")));
                         break;
@@ -1231,6 +1235,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 return true;
             case R.id.mnuAutoSendNow:
                 forceAutoSendNow();
+                return true;
             case R.id.mnuOwnCloud:
                 uploadToOwnCloud();
                 return true;
@@ -1240,6 +1245,9 @@ public boolean onMenuItemClick(MenuItem item) {
             case R.id.mnuCustomUrl:
                 uploadToCustomURL();
                 return true;
+            case R.id.mnuHttpFileUpload:
+                uploadToHttpFileUpload();
+                return true;
             default:
                 return true;
         }
@@ -1250,8 +1258,12 @@ private void forceAutoSendNow() {
         LOG.debug("User forced an auto send");
 
         if (preferenceHelper.isAutoSendEnabled()) {
-            Dialogs.progress(this, getString(R.string.autosend_sending));
-            EventBus.getDefault().post(new CommandEvents.AutoSend(null));
+            if (FileSenderFactory.getAvailableFileAutoSenders().isEmpty()) {
+                launchPreferenceScreen(MainPreferenceActivity.PREFERENCE_FRAGMENTS.UPLOAD);
+            } else {
+                Dialogs.progress(this, getString(R.string.autosend_sending));
+                EventBus.getDefault().post(new CommandEvents.AutoSend(null));
+            }
 
         } else {
             launchPreferenceScreen(MainPreferenceActivity.PREFERENCE_FRAGMENTS.UPLOAD);
@@ -1321,6 +1333,15 @@ private void uploadToCustomURL(){
         showFileListDialog(FileSenderFactory.getCustomUrlSender());
     }
 
+    private void uploadToHttpFileUpload(){
+        if(!FileSenderFactory.getHttpFileUploadSender().isAvailable()){
+            launchPreferenceScreen(MainPreferenceActivity.PREFERENCE_FRAGMENTS.HTTPFILEUPLOAD);
+            return;
+        }
+
+        showFileListDialog(FileSenderFactory.getHttpFileUploadSender());
+    }
+
     private void uploadToSFTP(){
         if(!FileSenderFactory.getSFTPSender().isAvailable()){
             launchPreferenceScreen(MainPreferenceActivity.PREFERENCE_FRAGMENTS.SFTP);
@@ -1610,6 +1631,23 @@ public void onEventMainThread(UploadEvents.CustomUrl upload){
         }
     }
 
+    @EventBusHook
+    public void onEventMainThread(UploadEvents.HttpFileUpload upload){
+        LOG.debug("HTTP File Upload Event completed, success: " + upload.success);
+        Dialogs.hideProgress();
+
+        if(!upload.success){
+            LOG.error(getString(R.string.http_file_upload_setup_title)
+                    + "-"
+                    + getString(R.string.upload_failure));
+
+            if(userInvokedUpload){
+                Dialogs.showError(getString(R.string.sorry), getString(R.string.upload_failure), upload.message, upload.throwable, this);
+                userInvokedUpload = false;
+            }
+        }
+    }
+
     @EventBusHook
     public void onEventMainThread(UploadEvents.AutoEmail upload){
         LOG.debug("Auto Email Event completed, success: " + upload.success);

gpslogger/src/main/java/com/mendhak/gpslogger/MainPreferenceActivity.java

@@ -141,6 +141,10 @@ protected void onCreate(Bundle savedInstanceState) {
                 setTitle(R.string.sftp_setup_title);
                 preferenceFragmentCompat = new SFTPSettingsFragment();
                 break;
+            case PREFERENCE_FRAGMENTS.HTTPFILEUPLOAD:
+                setTitle(R.string.http_file_upload_setup_title);
+                preferenceFragmentCompat = new HttpFileUploadSettingsFragment();
+                break;
         }
 
         getSupportFragmentManager().beginTransaction().replace(R.id.content_frame, preferenceFragmentCompat).commit();
@@ -190,6 +194,7 @@ public static class PREFERENCE_FRAGMENTS {
         public static final String OWNCLOUD = "OwnCloudAuthorizationFragment";
         public static final String OSM = "OSMAuthorizationFragment";
         public static final String SFTP = "SFTPSettingsFragment";
+        public static final String HTTPFILEUPLOAD = "HttpFileUploadSettingsFragment";
     }
 
 }

gpslogger/src/main/java/com/mendhak/gpslogger/common/PreferenceHelper.java

@@ -447,7 +447,7 @@ public int getAbsoluteTimeoutForAcquiringPosition() {
     public void setAbsoluteTimeoutForAcquiringPosition(int absoluteTimeout) {
         prefs.edit().putString(PreferenceNames.ABSOLUTE_TIMEOUT, String.valueOf(absoluteTimeout)).apply();
     }
-    
+
     /**
      * Reduce redundant passive location updates by adjusting the minimum collection interval (in seconds).
      */
@@ -720,6 +720,64 @@ public boolean shouldLogToOpenGTS() {
     }
 
 
+    @ProfilePreference(name=PreferenceNames.AUTOSEND_HTTPFILEUPLOAD_ENABLED)
+    public boolean isHttpFileUploadAutoSendEnabled() {
+        return prefs.getBoolean(PreferenceNames.AUTOSEND_HTTPFILEUPLOAD_ENABLED, false);
+    }
+
+    @ProfilePreference(name=PreferenceNames.HTTPFILEUPLOAD_URL)
+    public String getHttpFileUploadUrl() {
+        return prefs.getString(PreferenceNames.HTTPFILEUPLOAD_URL, "");
+    }
+
+    public void setHttpFileUploadUrl(String url) {
+        prefs.edit().putString(PreferenceNames.HTTPFILEUPLOAD_URL, url).apply();
+    }
+
+    @ProfilePreference(name=PreferenceNames.HTTPFILEUPLOAD_METHOD)
+    public String getHttpFileUploadMethod() {
+        return prefs.getString(PreferenceNames.HTTPFILEUPLOAD_METHOD, "POST");
+    }
+
+    public void setHttpFileUploadMethod(String method) {
+        prefs.edit().putString(PreferenceNames.HTTPFILEUPLOAD_METHOD, method).apply();
+    }
+
+    @ProfilePreference(name=PreferenceNames.HTTPFILEUPLOAD_HEADERS)
+    public String getHttpFileUploadHeaders() {
+        return prefs.getString(PreferenceNames.HTTPFILEUPLOAD_HEADERS, "");
+    }
+
+    public void setHttpFileUploadHeaders(String headers) {
+        prefs.edit().putString(PreferenceNames.HTTPFILEUPLOAD_HEADERS, headers).apply();
+    }
+
+    @ProfilePreference(name=PreferenceNames.HTTPFILEUPLOAD_BASICAUTH_USERNAME)
+    public String getHttpFileUploadUsername() {
+        return prefs.getString(PreferenceNames.HTTPFILEUPLOAD_BASICAUTH_USERNAME, "");
+    }
+
+    public void setHttpFileUploadUsername(String username) {
+        prefs.edit().putString(PreferenceNames.HTTPFILEUPLOAD_BASICAUTH_USERNAME, username).apply();
+    }
+
+    @ProfilePreference(name=PreferenceNames.HTTPFILEUPLOAD_BASICAUTH_PASSWORD)
+    public String getHttpFileUploadPassword() {
+        return prefs.getString(PreferenceNames.HTTPFILEUPLOAD_BASICAUTH_PASSWORD, "");
+    }
+
+    public void setHttpFileUploadPassword(String password) {
+        prefs.edit().putString(PreferenceNames.HTTPFILEUPLOAD_BASICAUTH_PASSWORD, password).apply();
+    }
+
+    @ProfilePreference(name=PreferenceNames.HTTPFILEUPLOAD_BODY_TYPE)
+    public String getHttpFileUploadBodyType() {
+        return prefs.getString(PreferenceNames.HTTPFILEUPLOAD_BODY_TYPE, "form-data");
+    }
+
+    public void setHttpFileUploadBodyType(String bodyType) {
+        prefs.edit().putString(PreferenceNames.HTTPFILEUPLOAD_BODY_TYPE, bodyType).apply();
+    }
 
 
     @ProfilePreference(name=PreferenceNames.LOG_PASSIVE_LOCATIONS)
@@ -1246,6 +1304,20 @@ public void setShouldLogOnlyIfSignificantMotion(boolean value){
         prefs.edit().putBoolean(PreferenceNames.ONLY_LOG_IF_SIGNIFICANT_MOTION, value).apply();
     }
 
+    @ProfilePreference(name= PreferenceNames.SIGNIFICANT_MOTION_BYPASS_INTERVAL)
+    public int getSignificantMotionBypassInterval() {
+        try{
+            return Integer.parseInt(prefs.getString(PreferenceNames.SIGNIFICANT_MOTION_BYPASS_INTERVAL, "0"));
+        }
+        catch(Exception e){
+            return 0;
+        }
+    }
+
+    public void setSignificantMotionBypassInterval(int value){
+        prefs.edit().putString(PreferenceNames.SIGNIFICANT_MOTION_BYPASS_INTERVAL, String.valueOf(value)).apply();
+    }
+
     @SuppressWarnings("unchecked")
     public void savePropertiesFromPreferences(File f) throws IOException {
 

gpslogger/src/main/java/com/mendhak/gpslogger/common/PreferenceNames.java

@@ -50,6 +50,15 @@ public  class PreferenceNames {
     public static final String LOG_TO_URL_BASICAUTH_PASSWORD = "log_customurl_basicauth_password";
     public static final String LOG_TO_URL_DISCARD_OFFLINE_LOCATIONS_ENABLED = "log_customurl_discard_offline_locations_enabled";
     public static final String AUTOSEND_CUSTOMURL_ENABLED = "autocustomurl_enabled";
+
+    public static final String AUTOSEND_HTTPFILEUPLOAD_ENABLED = "autohttpfileupload_enabled";
+    public static final String HTTPFILEUPLOAD_URL = "httpfileupload_url";
+    public static final String HTTPFILEUPLOAD_METHOD = "httpfileupload_method";
+    public static final String HTTPFILEUPLOAD_HEADERS = "httpfileupload_headers";
+    public static final String HTTPFILEUPLOAD_BASICAUTH_USERNAME = "httpfileupload_basicauth_username";
+    public static final String HTTPFILEUPLOAD_BASICAUTH_PASSWORD = "httpfileupload_basicauth_password";
+    public static final String HTTPFILEUPLOAD_BODY_TYPE = "httpfileupload_body_type";
+
     public static final String LOG_TO_OPENGTS = "log_opengts";
     public static final String LOG_PASSIVE_LOCATIONS="log_passive_locations";
     public static final String LOG_SATELLITE_LOCATIONS = "log_satellite_locations";
@@ -148,5 +157,6 @@ public static enum DegreesDisplayFormat {
     public static final String ANNOTATIONS_BUTTON_SETTINGS = "annotations_buttons";
 
     public static final String ONLY_LOG_IF_SIGNIFICANT_MOTION = "only_log_if_significant_motion";
+    public static final String SIGNIFICANT_MOTION_BYPASS_INTERVAL = "significant_motion_bypass_interval";
 
 }

gpslogger/src/main/java/com/mendhak/gpslogger/common/events/UploadEvents.java

@@ -105,4 +105,6 @@ public static class SFTP extends BaseUploadEvent {
         public String fingerprint;
         public String hostKey;
     }
+
+    public static class HttpFileUpload extends BaseUploadEvent {}
 }

gpslogger/src/main/java/com/mendhak/gpslogger/senders/FileSender.java

@@ -35,6 +35,7 @@ public static class SenderNames {
         public static final String SFTP = "SFTP_SENDER";
         public static final String OPENSTREETMAP = "OSM_SENDER";
         public static final String CUSTOMURL = "CUSTOM_URL_SENDER";
+        public static final String HTTPFILEUPLOAD = "HTTP_FILE_UPLOAD_SENDER";
     }
 
 

gpslogger/src/main/java/com/mendhak/gpslogger/senders/FileSenderFactory.java

@@ -27,6 +27,7 @@
 import com.mendhak.gpslogger.senders.email.AutoEmailManager;
 import com.mendhak.gpslogger.senders.ftp.FtpManager;
 import com.mendhak.gpslogger.senders.googledrive.GoogleDriveManager;
+import com.mendhak.gpslogger.senders.http.HttpFileUploadManager;
 import com.mendhak.gpslogger.senders.opengts.OpenGTSManager;
 import com.mendhak.gpslogger.senders.osm.OpenStreetMapManager;
 import com.mendhak.gpslogger.senders.owncloud.OwnCloudManager;
@@ -80,6 +81,10 @@ public static FileSender getCustomUrlSender(){
         return new CustomUrlManager(PreferenceHelper.getInstance());
     }
 
+    public static FileSender getHttpFileUploadSender() {
+        return new HttpFileUploadManager(PreferenceHelper.getInstance());
+    }
+
     public static void autoSendFiles(final String fileToSend) {
 
         PreferenceHelper preferenceHelper = PreferenceHelper.getInstance();
@@ -164,6 +169,8 @@ public static FileSender getSenderByName(String senderName) {
                 return getSFTPSender();
             case FileSender.SenderNames.CUSTOMURL:
                 return getCustomUrlSender();
+            case FileSender.SenderNames.HTTPFILEUPLOAD:
+                return getHttpFileUploadSender();
             default:
                 return null;
 
@@ -181,10 +188,11 @@ private static List<FileSender> getAllFileSenders(){
             senders.add(getOwnCloudSender());
             senders.add(getSFTPSender());
             senders.add(getCustomUrlSender());
+            senders.add(getHttpFileUploadSender());
         return senders;
     }
 
-    private static List<FileSender> getAvailableFileAutoSenders() {
+    public static List<FileSender> getAvailableFileAutoSenders() {
 
         List<FileSender> senders = new ArrayList<>();
 
@@ -224,6 +232,10 @@ private static List<FileSender> getAvailableFileAutoSenders() {
             senders.add(getCustomUrlSender());
         }
 
+        if(getHttpFileUploadSender().isAutoSendAvailable()){
+            senders.add(getHttpFileUploadSender());
+        }
+
         return senders;
 
     }