From 43bda63535ecdbcfb8ae74b33f4799fdcf8e3bb3 Mon Sep 17 00:00:00 2001 From: sdesprez Date: Fri, 4 May 2018 17:13:21 +0200 Subject: [PATCH] [Feature] Add a commit message for automatic push in bus flavor --- build.gradle | 2 ++ .../java/io/jawg/osmcontributor/rest/managers/SyncManager.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3af5fceb..879c9939 100644 --- a/build.gradle +++ b/build.gradle @@ -133,6 +133,7 @@ android { buildConfigField "String", "FLICKR_TOKEN", '"' + loadPropertiesFile("conf.properties").getProperty("flickr_token") + '"' buildConfigField "String", "FLICKR_TOKEN_SECRET", '"' + loadPropertiesFile("conf.properties").getProperty("flickr_token_secret") + '"' buildConfigField "String", "MAPBOX_TOKEN", '"' + loadPropertiesFile("conf.properties").getProperty("mapbox_token") + '"' + buildConfigField "String", "AUTO_COMMIT_CHANGESET", '""' } bus { @@ -157,6 +158,7 @@ android { buildConfigField "String", "FLICKR_TOKEN", '"' + loadPropertiesFile("conf.properties").getProperty("flickr_token") + '"' buildConfigField "String", "FLICKR_TOKEN_SECRET", '"' + loadPropertiesFile("conf.properties").getProperty("flickr_token_secret") + '"' buildConfigField "String", "MAPBOX_TOKEN", '"' + loadPropertiesFile("conf.properties").getProperty("mapbox_token") + '"' + buildConfigField "String", "AUTO_COMMIT_CHANGESET", '"Edited bus stop(s)"' } } diff --git a/src/main/java/io/jawg/osmcontributor/rest/managers/SyncManager.java b/src/main/java/io/jawg/osmcontributor/rest/managers/SyncManager.java index ec2d2741..072ccf20 100644 --- a/src/main/java/io/jawg/osmcontributor/rest/managers/SyncManager.java +++ b/src/main/java/io/jawg/osmcontributor/rest/managers/SyncManager.java @@ -29,6 +29,7 @@ import javax.inject.Inject; +import io.jawg.osmcontributor.BuildConfig; import io.jawg.osmcontributor.database.dao.PoiDao; import io.jawg.osmcontributor.database.dao.PoiTypeDao; import io.jawg.osmcontributor.database.events.DbInitializedEvent; @@ -136,7 +137,7 @@ public void onInitDbEvent(InitDbEvent event) { public Observable sync() { return Observable.create(subscriber -> { - subscriber.onNext(remoteAddOrUpdateOrDeletePois("", poiDao.queryForAllUpdated(), poiDao.queryForAllNew(), poiDao.queryToDelete())); + subscriber.onNext(remoteAddOrUpdateOrDeletePois(BuildConfig.AUTO_COMMIT_CHANGESET, poiDao.queryForAllUpdated(), poiDao.queryForAllNew(), poiDao.queryToDelete())); subscriber.onCompleted(); }); }