Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move LocalHTTPD and WifiStateChangeService into ".nearby" package

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2019-06-17 10:17:30 +02:00
parent 43c7574228
commit 15d349f863
16 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
View File

@ -23,10 +23,10 @@ import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.nearby.LocalHTTPD;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
import org.fdroid.fdroid.nearby.LocalRepoManager;
import org.fdroid.fdroid.nearby.LocalRepoService;
import org.fdroid.fdroid.net.LocalHTTPD;
import org.junit.Test;
import java.io.File;
@ -52,7 +52,7 @@ public class SwapRepoEmulatorTest {
public static final String TAG = "SwapRepoEmulatorTest";
/**
* @see org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread#run()
* @see org.fdroid.fdroid.nearby.WifiStateChangeService.WifiInfoThread#run()
*/
@Test
public void testSwap()

2
app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java → app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
View File

@ -17,7 +17,7 @@
* MA 02110-1301, USA.
*/
package org.fdroid.fdroid.net;
package org.fdroid.fdroid.nearby;
import android.content.Context;
import android.content.Intent;

2
app/src/full/AndroidManifest.xml
View File

@ -74,7 +74,7 @@
</receiver>
<service
android:name=".net.WifiStateChangeService"
android:name=".nearby.WifiStateChangeService"
android:exported="false"/>
<service android:name=".nearby.SwapService"/>

4
app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java → app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net;
package org.fdroid.fdroid.nearby;
/*
* #%L
@ -38,8 +38,6 @@ import android.net.Uri;
import fi.iki.elonen.NanoHTTPD;
import fi.iki.elonen.NanoHTTPD.Response.IStatus;
import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
import javax.net.ssl.SSLServerSocketFactory;
import java.io.File;

2
app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
View File

@ -10,8 +10,6 @@ import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.net.LocalHTTPD;
import org.fdroid.fdroid.net.WifiStateChangeService;
import java.io.IOException;
import java.net.BindException;

4
app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
View File

@ -26,11 +26,7 @@ import cc.mvdan.accesspoint.WifiApControl;
import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.nearby.BluetoothManager;
import org.fdroid.fdroid.nearby.SwapService;
import org.fdroid.fdroid.nearby.SwapView;
import org.fdroid.fdroid.nearby.peers.Peer;
import org.fdroid.fdroid.net.WifiStateChangeService;
import java.util.ArrayList;

1
app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
View File

@ -33,7 +33,6 @@ import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.nearby.peers.Peer;
import org.fdroid.fdroid.net.Downloader;
import org.fdroid.fdroid.net.WifiStateChangeService;
import java.io.IOException;
import java.io.OutputStream;

1
app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
View File

@ -63,7 +63,6 @@ import org.fdroid.fdroid.nearby.peers.Peer;
import org.fdroid.fdroid.net.BluetoothDownloader;
import org.fdroid.fdroid.net.Downloader;
import org.fdroid.fdroid.net.HttpDownloader;
import org.fdroid.fdroid.net.WifiStateChangeService;
import org.fdroid.fdroid.qr.CameraCharacteristicsChecker;
import org.fdroid.fdroid.qr.QrGenAsyncTask;
import org.fdroid.fdroid.views.main.MainActivity;

4
app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java → app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net;
package org.fdroid.fdroid.nearby;
import android.app.IntentService;
import android.content.ComponentName;
@ -23,8 +23,6 @@ import org.fdroid.fdroid.R;
import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
import org.fdroid.fdroid.nearby.LocalRepoManager;
import java.net.Inet6Address;
import java.net.InetAddress;

2
app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
View File

@ -5,7 +5,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiManager;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.net.WifiStateChangeService;
import org.fdroid.fdroid.nearby.WifiStateChangeService;
public class WifiStateChangeReceiver extends BroadcastReceiver {
private static final String TAG = "WifiStateChangeReceiver";

4
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -75,7 +75,7 @@ import org.fdroid.fdroid.net.ConnectivityMonitorService;
import org.fdroid.fdroid.net.Downloader;
import org.fdroid.fdroid.net.HttpDownloader;
import org.fdroid.fdroid.net.ImageLoaderForUIL;
import org.fdroid.fdroid.net.WifiStateChangeService;
import org.fdroid.fdroid.nearby.WifiStateChangeService;
import org.fdroid.fdroid.views.hiding.HidingManager;
import javax.microedition.khronos.opengles.GL10;
@ -234,7 +234,7 @@ public class FDroidApp extends Application {
/**
* Initialize the settings needed to run a local swap repo. This should
* only ever be called in {@link org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread},
* only ever be called in {@link WifiStateChangeService.WifiInfoThread},
* after the single init call in {@link FDroidApp#onCreate()}.
*/
public static void initWifiSettings() {

2
app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
View File

@ -52,7 +52,7 @@ import java.net.URL;
public class HttpDownloader extends Downloader {
private static final String TAG = "HttpDownloader";
static final String HEADER_FIELD_ETAG = "ETag";
public static final String HEADER_FIELD_ETAG = "ETag";
private final String username;
private final String password;

2
app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
View File

@ -58,7 +58,7 @@ import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.NewRepoConfig;
import org.fdroid.fdroid.nearby.SDCardScannerService;
import org.fdroid.fdroid.nearby.SwapService;
import org.fdroid.fdroid.net.WifiStateChangeService;
import org.fdroid.fdroid.nearby.WifiStateChangeService;
import org.fdroid.fdroid.views.AppDetailsActivity;
import org.fdroid.fdroid.views.ManageReposActivity;
import org.fdroid.fdroid.views.apps.AppListActivity;

3
app/src/testFull/java/org/fdroid/fdroid/net/LocalHTTPDTest.java → app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net;
package org.fdroid.fdroid.nearby;
/*
* #%L
@ -38,6 +38,7 @@ import android.text.TextUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.net.HttpDownloader;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

2
app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java → app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net;
package org.fdroid.fdroid.nearby;
import org.junit.Test;

5
app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
View File

@ -26,7 +26,8 @@ import org.fdroid.fdroid.data.TempAppProvider;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
import org.fdroid.fdroid.nearby.LocalRepoManager;
import org.fdroid.fdroid.nearby.LocalRepoService;
import org.fdroid.fdroid.net.LocalHTTPD;
import org.fdroid.fdroid.nearby.WifiStateChangeService;
import org.fdroid.fdroid.nearby.LocalHTTPD;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@ -94,7 +95,7 @@ public class SwapRepoTest {
}
/**
* @see org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread#run()
* @see WifiStateChangeService.WifiInfoThread#run()
*/
@Test
public void testSwap()