From cc7a130c1dd8516dfc484dba7982742d324a8df3 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 31 Oct 2016 18:25:55 +0900 Subject: [PATCH] Renamed syncthing package to service --- .../java/com/nutomic/syncthingandroid/test/MockRestApi.java | 2 +- .../nutomic/syncthingandroid/test/MockSyncthingService.java | 4 ++-- .../syncthingandroid/test/activities/MainActivityTest.java | 2 +- .../test/syncthing/AppConfigReceiverTest.java | 2 +- .../test/syncthing/BatteryReceiverTest.java | 4 ++-- .../syncthingandroid/test/syncthing/BootReceiverTest.java | 4 ++-- .../test/syncthing/DeviceStateHolderTest.java | 2 +- .../test/syncthing/NetworkReceiverTest.java | 4 ++-- .../syncthingandroid/test/syncthing/RestApiTest.java | 6 +++--- .../test/syncthing/SyncthingRunnableTest.java | 2 +- .../test/syncthing/SyncthingServiceBinderTest.java | 4 ++-- .../test/syncthing/SyncthingServiceTest.java | 6 ++---- .../syncthingandroid/test/util/FolderObserverTest.java | 2 +- src/main/AndroidManifest.xml | 2 +- .../syncthingandroid/activities/FolderPickerActivity.java | 2 +- .../nutomic/syncthingandroid/activities/MainActivity.java | 3 +-- .../syncthingandroid/activities/RestartActivity.java | 2 +- .../syncthingandroid/activities/SyncthingActivity.java | 6 +++--- .../nutomic/syncthingandroid/activities/WebGuiActivity.java | 2 +- .../nutomic/syncthingandroid/fragments/DeviceFragment.java | 5 ++--- .../syncthingandroid/fragments/DeviceListFragment.java | 2 +- .../nutomic/syncthingandroid/fragments/DrawerFragment.java | 4 ++-- .../nutomic/syncthingandroid/fragments/FolderFragment.java | 6 ++---- .../syncthingandroid/fragments/FolderListFragment.java | 2 +- .../syncthingandroid/fragments/SettingsFragment.java | 4 ++-- .../java/com/nutomic/syncthingandroid/http/RestTask.java | 2 -- .../syncthingandroid/receiver/AppConfigReceiver.java | 2 +- .../nutomic/syncthingandroid/receiver/BatteryReceiver.java | 4 ++-- .../com/nutomic/syncthingandroid/receiver/BootReceiver.java | 2 +- .../nutomic/syncthingandroid/receiver/NetworkReceiver.java | 4 ++-- .../{syncthing => service}/DeviceStateHolder.java | 2 +- .../{syncthing => service}/EventProcessor.java | 3 +-- .../syncthingandroid/{syncthing => service}/RestApi.java | 2 +- .../{syncthing => service}/SyncthingRunnable.java | 2 +- .../{syncthing => service}/SyncthingService.java | 2 +- .../{syncthing => service}/SyncthingServiceBinder.java | 2 +- .../java/com/nutomic/syncthingandroid/util/ConfigXml.java | 2 +- .../com/nutomic/syncthingandroid/util/FolderObserver.java | 1 - .../com/nutomic/syncthingandroid/views/DevicesAdapter.java | 2 +- .../com/nutomic/syncthingandroid/views/FoldersAdapter.java | 2 +- 40 files changed, 54 insertions(+), 64 deletions(-) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => service}/DeviceStateHolder.java (99%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => service}/EventProcessor.java (99%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => service}/RestApi.java (99%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => service}/SyncthingRunnable.java (99%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => service}/SyncthingService.java (99%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => service}/SyncthingServiceBinder.java (86%) diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/MockRestApi.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/MockRestApi.java index d9f06d73..1d7222a7 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/MockRestApi.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/MockRestApi.java @@ -4,7 +4,7 @@ import android.app.Activity; import android.content.Context; import android.support.annotation.NonNull; -import com.nutomic.syncthingandroid.syncthing.RestApi; +import com.nutomic.syncthingandroid.service.RestApi; import java.net.URL; import java.util.ArrayList; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/MockSyncthingService.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/MockSyncthingService.java index 264dd8b3..87ce2b67 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/MockSyncthingService.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/MockSyncthingService.java @@ -3,8 +3,8 @@ package com.nutomic.syncthingandroid.test; import android.content.Intent; import android.os.IBinder; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.RestApi; +import com.nutomic.syncthingandroid.service.SyncthingService; import java.net.URL; import java.util.LinkedList; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java index 6fe6c9f5..91f0aa04 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule; import com.nutomic.syncthingandroid.activities.MainActivity; import com.nutomic.syncthingandroid.fragments.DeviceListFragment; import com.nutomic.syncthingandroid.fragments.FolderListFragment; -import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder; +import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; import com.nutomic.syncthingandroid.test.MockSyncthingService; import org.junit.Assert; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java index 3227d7da..56eaa3e9 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java @@ -6,7 +6,7 @@ import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; import com.nutomic.syncthingandroid.receiver.AppConfigReceiver; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; import org.junit.After; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java index 2c8af0ba..2d4dfda7 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java @@ -6,8 +6,8 @@ import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; import com.nutomic.syncthingandroid.receiver.BatteryReceiver; -import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.DeviceStateHolder; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; import org.junit.After; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BootReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BootReceiverTest.java index 2a9bf6c1..8f06e277 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BootReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BootReceiverTest.java @@ -6,7 +6,7 @@ import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; import com.nutomic.syncthingandroid.receiver.BootReceiver; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; import org.junit.After; @@ -17,7 +17,7 @@ import org.junit.Test; /** * Tests that {@link BootReceiver} starts the right service - * ({@link com.nutomic.syncthingandroid.syncthing.SyncthingService}. + * ({@link com.nutomic.syncthingandroid.service.SyncthingService}. */ public class BootReceiverTest { diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/DeviceStateHolderTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/DeviceStateHolderTest.java index 16bb5ca1..608babb9 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/DeviceStateHolderTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/DeviceStateHolderTest.java @@ -5,7 +5,7 @@ import android.os.BatteryManager; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; +import com.nutomic.syncthingandroid.service.DeviceStateHolder; import com.nutomic.syncthingandroid.test.MockContext; import org.junit.Assert; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java index 02ac72af..4e741dcc 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java @@ -6,9 +6,9 @@ import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; +import com.nutomic.syncthingandroid.service.DeviceStateHolder; import com.nutomic.syncthingandroid.receiver.NetworkReceiver; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; import org.junit.After; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/RestApiTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/RestApiTest.java index 9bd71d1f..31b88d0a 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/RestApiTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/RestApiTest.java @@ -5,9 +5,9 @@ import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; import com.nutomic.syncthingandroid.http.PollWebGuiAvailableTask; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingRunnable; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.RestApi; +import com.nutomic.syncthingandroid.service.SyncthingRunnable; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; import com.nutomic.syncthingandroid.util.ConfigXml; import com.nutomic.syncthingandroid.util.Util; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingRunnableTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingRunnableTest.java index f8429e8d..f704d8e8 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingRunnableTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingRunnableTest.java @@ -3,7 +3,7 @@ package com.nutomic.syncthingandroid.test.syncthing; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.SyncthingRunnable; +import com.nutomic.syncthingandroid.service.SyncthingRunnable; import com.nutomic.syncthingandroid.test.MockContext; import org.junit.Assert; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceBinderTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceBinderTest.java index 20fc51f0..df772cef 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceBinderTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceBinderTest.java @@ -2,8 +2,8 @@ package com.nutomic.syncthingandroid.test.syncthing; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; -import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder; +import com.nutomic.syncthingandroid.service.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; import org.junit.Assert; import org.junit.Rule; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceTest.java index 3dc30f8c..bf706c14 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceTest.java @@ -9,8 +9,8 @@ import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; -import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder; +import com.nutomic.syncthingandroid.service.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; import com.nutomic.syncthingandroid.util.ConfigXml; import org.junit.After; @@ -21,8 +21,6 @@ import org.junit.Test; import java.io.File; import java.io.IOException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; /** diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FolderObserverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FolderObserverTest.java index 7299c02e..0733a63b 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FolderObserverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FolderObserverTest.java @@ -3,7 +3,7 @@ package com.nutomic.syncthingandroid.test.util; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.RestApi; +import com.nutomic.syncthingandroid.service.RestApi; import com.nutomic.syncthingandroid.test.MockContext; import com.nutomic.syncthingandroid.test.Util; import com.nutomic.syncthingandroid.util.FolderObserver; diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 125d0c90..55cf7f8e 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -79,7 +79,7 @@ android:theme="@style/Theme.Syncthing.Translucent" android:launchMode="singleTop"/> - + diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java index e8dfb309..a8cd47ce 100644 --- a/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java +++ b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java @@ -28,7 +28,7 @@ import android.widget.Toast; import com.google.common.collect.Sets; import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java index cf71649f..aad77370 100644 --- a/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java +++ b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java @@ -30,8 +30,7 @@ import com.nutomic.syncthingandroid.fragments.DeviceListFragment; import com.nutomic.syncthingandroid.fragments.DrawerFragment; import com.nutomic.syncthingandroid.fragments.FolderListFragment; import com.nutomic.syncthingandroid.model.Options; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import java.util.Date; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java index b860cf79..b403a2b4 100644 --- a/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java +++ b/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java @@ -10,7 +10,7 @@ import android.os.Bundle; import android.support.v4.app.NotificationCompat; import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; /** * Shows restart dialog. diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java index a3c71d1c..941fc0e3 100644 --- a/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java +++ b/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java @@ -7,9 +7,9 @@ import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; -import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder; +import com.nutomic.syncthingandroid.service.RestApi; +import com.nutomic.syncthingandroid.service.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; import java.util.LinkedList; diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java index 478831d7..63817c98 100644 --- a/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java +++ b/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java @@ -16,7 +16,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.util.ConfigXml; import java.io.FileInputStream; diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java index bd1dbf81..59b26e95 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java @@ -28,8 +28,7 @@ import com.nutomic.syncthingandroid.activities.SettingsActivity; import com.nutomic.syncthingandroid.activities.SyncthingActivity; import com.nutomic.syncthingandroid.model.Connection; import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.util.Compression; import com.nutomic.syncthingandroid.util.TextWatcherAdapter; import com.nutomic.syncthingandroid.util.Util; @@ -43,7 +42,7 @@ import static android.text.TextUtils.isEmpty; import static android.view.View.GONE; import static android.view.View.VISIBLE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN; -import static com.nutomic.syncthingandroid.syncthing.SyncthingService.State.ACTIVE; +import static com.nutomic.syncthingandroid.service.SyncthingService.State.ACTIVE; import static com.nutomic.syncthingandroid.util.Compression.METADATA; /** diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java index c3c953fc..8b01ec2d 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java @@ -14,7 +14,7 @@ import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.activities.SettingsActivity; import com.nutomic.syncthingandroid.activities.SyncthingActivity; import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.views.DevicesAdapter; import java.util.Collections; diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java index 80edafe1..fc9e3cbf 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java @@ -18,8 +18,8 @@ import com.nutomic.syncthingandroid.activities.WebGuiActivity; import com.nutomic.syncthingandroid.model.Connection; import com.nutomic.syncthingandroid.model.SystemInfo; import com.nutomic.syncthingandroid.model.SystemVersion; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.RestApi; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.util.Util; import java.text.NumberFormat; diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java index 7bb04595..feb27ee0 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java @@ -34,11 +34,9 @@ import com.nutomic.syncthingandroid.activities.SyncthingActivity; import com.nutomic.syncthingandroid.fragments.dialog.KeepVersionsDialogFragment; import com.nutomic.syncthingandroid.model.Device; import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.util.TextWatcherAdapter; -import java.util.ArrayList; import java.util.List; import static android.support.v4.view.MarginLayoutParamsCompat.setMarginEnd; @@ -46,7 +44,7 @@ import static android.support.v4.view.MarginLayoutParamsCompat.setMarginStart; import static android.util.TypedValue.COMPLEX_UNIT_DIP; import static android.view.Gravity.CENTER_VERTICAL; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import static com.nutomic.syncthingandroid.syncthing.SyncthingService.State.ACTIVE; +import static com.nutomic.syncthingandroid.service.SyncthingService.State.ACTIVE; import static java.lang.String.valueOf; /** diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java index 044e92fb..d008141a 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java @@ -14,7 +14,7 @@ import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.activities.SettingsActivity; import com.nutomic.syncthingandroid.activities.SyncthingActivity; import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; import com.nutomic.syncthingandroid.views.FoldersAdapter; import java.util.Collections; diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java index 0997ae70..1f599219 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java @@ -22,8 +22,8 @@ import com.nutomic.syncthingandroid.model.Config; import com.nutomic.syncthingandroid.model.Device; import com.nutomic.syncthingandroid.model.Options; import com.nutomic.syncthingandroid.views.WifiSsidPreference; -import com.nutomic.syncthingandroid.syncthing.RestApi; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.RestApi; +import com.nutomic.syncthingandroid.service.SyncthingService; import java.security.InvalidParameterException; import java.util.List; diff --git a/src/main/java/com/nutomic/syncthingandroid/http/RestTask.java b/src/main/java/com/nutomic/syncthingandroid/http/RestTask.java index 03ce1220..2de03a79 100644 --- a/src/main/java/com/nutomic/syncthingandroid/http/RestTask.java +++ b/src/main/java/com/nutomic/syncthingandroid/http/RestTask.java @@ -4,13 +4,11 @@ package com.nutomic.syncthingandroid.http; import android.annotation.SuppressLint; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.Nullable; import android.util.Log; import android.util.Pair; import com.google.common.base.Charsets; import com.google.common.io.ByteSource; -import com.nutomic.syncthingandroid.syncthing.RestApi; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java index 309fec79..12315eaf 100644 --- a/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java @@ -12,7 +12,7 @@ import android.support.v4.app.NotificationCompat; import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.activities.MainActivity; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; /** * Broadcast-receiver to control and configure SyncThing remotely diff --git a/src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java index 4a8682fa..b7189b37 100644 --- a/src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.DeviceStateHolder; +import com.nutomic.syncthingandroid.service.SyncthingService; /** * Receives battery plug/unplug intents and sends the charging state to {@link SyncthingService}. diff --git a/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java index 0bfd3347..672484a0 100644 --- a/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.SyncthingService; public class BootReceiver extends BroadcastReceiver { diff --git a/src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java index 19fa603c..cc202b18 100644 --- a/src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java @@ -7,8 +7,8 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; -import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; -import com.nutomic.syncthingandroid.syncthing.SyncthingService; +import com.nutomic.syncthingandroid.service.DeviceStateHolder; +import com.nutomic.syncthingandroid.service.SyncthingService; /** * Receives network connection change intents and sends the wifi state to {@link SyncthingService}. diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/DeviceStateHolder.java b/src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java similarity index 99% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/DeviceStateHolder.java rename to src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java index 01a4f4b2..133480ee 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/DeviceStateHolder.java +++ b/src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.service; import android.annotation.TargetApi; import android.content.BroadcastReceiver; diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/EventProcessor.java b/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java similarity index 99% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/EventProcessor.java rename to src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java index a8652d4a..a0dc343d 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/EventProcessor.java +++ b/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.service; import android.app.Notification; import android.app.NotificationManager; @@ -13,7 +13,6 @@ import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.util.Log; -import com.google.gson.JsonObject; import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.activities.SettingsActivity; import com.nutomic.syncthingandroid.fragments.DeviceFragment; diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java b/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java similarity index 99% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java rename to src/main/java/com/nutomic/syncthingandroid/service/RestApi.java index a5746a32..608d56c3 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java +++ b/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.service; import android.app.Activity; import android.app.NotificationManager; diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java similarity index 99% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java rename to src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java index edd19edd..7f8b22e9 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java +++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.service; import android.content.Context; import android.content.Intent; diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java similarity index 99% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java rename to src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java index 7a3bcda0..64eaede5 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java +++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.service; import android.annotation.TargetApi; import android.app.NotificationManager; diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingServiceBinder.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java similarity index 86% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingServiceBinder.java rename to src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java index 79b280d9..67b0400c 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingServiceBinder.java +++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.service; import android.os.Binder; diff --git a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java index a8070931..215ddfb5 100644 --- a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java +++ b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java @@ -7,7 +7,7 @@ import android.preference.PreferenceManager; import android.util.Log; import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.syncthing.SyncthingRunnable; +import com.nutomic.syncthingandroid.service.SyncthingRunnable; import org.mindrot.jbcrypt.BCrypt; import org.w3c.dom.Document; diff --git a/src/main/java/com/nutomic/syncthingandroid/util/FolderObserver.java b/src/main/java/com/nutomic/syncthingandroid/util/FolderObserver.java index de0b3d45..44aa5e43 100644 --- a/src/main/java/com/nutomic/syncthingandroid/util/FolderObserver.java +++ b/src/main/java/com/nutomic/syncthingandroid/util/FolderObserver.java @@ -4,7 +4,6 @@ import android.os.FileObserver; import android.util.Log; import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.syncthing.RestApi; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java b/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java index bde589b8..52d6fcf3 100644 --- a/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java +++ b/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.model.Connection; import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.syncthing.RestApi; +import com.nutomic.syncthingandroid.service.RestApi; import com.nutomic.syncthingandroid.util.Util; import java.util.HashMap; diff --git a/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java b/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java index 61c5cd19..69a148a0 100644 --- a/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java +++ b/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java @@ -14,7 +14,7 @@ import com.nutomic.syncthingandroid.BuildConfig; import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.model.Folder; import com.nutomic.syncthingandroid.model.Model; -import com.nutomic.syncthingandroid.syncthing.RestApi; +import com.nutomic.syncthingandroid.service.RestApi; import com.nutomic.syncthingandroid.util.Util; import java.util.HashMap;