From 32aad6b56262c67525a81e96e4d67ca42887f3e9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 17 Jun 2019 10:39:49 +0200 Subject: [PATCH] move ".net.bluetooth" into ".nearby" package --- .../{net/bluetooth => nearby}/BluetoothClient.java | 2 +- .../{net/bluetooth => nearby}/BluetoothClient.java | 2 +- .../org/fdroid/fdroid/nearby/BluetoothManager.java | 1 - .../{net/bluetooth => nearby}/BluetoothServer.java | 6 +++--- .../{net/bluetooth => nearby}/BluetoothConnection.java | 2 +- .../{net/bluetooth => nearby}/BluetoothConstants.java | 2 +- .../httpish}/ContentLengthHeader.java | 4 +--- .../httpish/headers => nearby/httpish}/ETagHeader.java | 4 +--- .../{net/bluetooth => nearby/httpish}/FileDetails.java | 6 +++--- .../httpish/headers => nearby/httpish}/Header.java | 8 +++----- .../{net/bluetooth => nearby}/httpish/Request.java | 4 ++-- .../{net/bluetooth => nearby}/httpish/Response.java | 8 +++----- .../org/fdroid/fdroid/net/BluetoothDownloader.java | 10 +++++----- 13 files changed, 25 insertions(+), 34 deletions(-) rename app/src/basic/java/org/fdroid/fdroid/{net/bluetooth => nearby}/BluetoothClient.java (95%) rename app/src/full/java/org/fdroid/fdroid/{net/bluetooth => nearby}/BluetoothClient.java (95%) rename app/src/full/java/org/fdroid/fdroid/{net/bluetooth => nearby}/BluetoothServer.java (98%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth => nearby}/BluetoothConnection.java (97%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth => nearby}/BluetoothConstants.java (93%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth/httpish/headers => nearby/httpish}/ContentLengthHeader.java (70%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth/httpish/headers => nearby/httpish}/ETagHeader.java (66%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth => nearby/httpish}/FileDetails.java (69%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth/httpish/headers => nearby/httpish}/Header.java (77%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth => nearby}/httpish/Request.java (98%) rename app/src/main/java/org/fdroid/fdroid/{net/bluetooth => nearby}/httpish/Response.java (94%) diff --git a/app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java similarity index 95% rename from app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java rename to app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java index bb095c56a..70fd65be9 100644 --- a/app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java +++ b/app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java @@ -17,7 +17,7 @@ * MA 02110-1301, USA. */ -package org.fdroid.fdroid.net.bluetooth; +package org.fdroid.fdroid.nearby; /** * Dummy version for basic app flavor. diff --git a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java similarity index 95% rename from app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java rename to app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java index 801280ca4..10eb0d8a4 100644 --- a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth; +package org.fdroid.fdroid.nearby; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java index 8be08fe88..e9445185e 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java @@ -16,7 +16,6 @@ import android.util.Log; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.peers.BluetoothPeer; -import org.fdroid.fdroid.net.bluetooth.BluetoothServer; import java.lang.ref.WeakReference; diff --git a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java similarity index 98% rename from app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java rename to app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java index df20f70b8..47d181e95 100644 --- a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth; +package org.fdroid.fdroid.nearby; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothServerSocket; @@ -7,8 +7,8 @@ import android.util.Log; import android.webkit.MimeTypeMap; import fi.iki.elonen.NanoHTTPD; import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.net.bluetooth.httpish.Request; -import org.fdroid.fdroid.net.bluetooth.httpish.Response; +import org.fdroid.fdroid.nearby.httpish.Request; +import org.fdroid.fdroid.nearby.httpish.Response; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java similarity index 97% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java rename to app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java index 8ea05577d..7b1fc8041 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth; +package org.fdroid.fdroid.nearby; import android.bluetooth.BluetoothSocket; import org.fdroid.fdroid.Utils; diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java similarity index 93% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java rename to app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java index 973fa26e2..f7c34dc3d 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth; +package org.fdroid.fdroid.nearby; import java.util.UUID; diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java similarity index 70% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java index a2cc07c6c..53c2bbd9e 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java @@ -1,6 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth.httpish.headers; - -import org.fdroid.fdroid.net.bluetooth.FileDetails; +package org.fdroid.fdroid.nearby.httpish; public class ContentLengthHeader extends Header { diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java similarity index 66% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java index 81eb41dc3..1b00fbe4f 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java @@ -1,6 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth.httpish.headers; - -import org.fdroid.fdroid.net.bluetooth.FileDetails; +package org.fdroid.fdroid.nearby.httpish; public class ETagHeader extends Header { diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java similarity index 69% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java index 96c57f63c..a01f81ab8 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid.net.bluetooth; +package org.fdroid.fdroid.nearby.httpish; public class FileDetails { @@ -13,11 +13,11 @@ public class FileDetails { return fileSize; } - public void setFileSize(int fileSize) { + void setFileSize(int fileSize) { this.fileSize = fileSize; } - public void setCacheTag(String cacheTag) { + void setCacheTag(String cacheTag) { this.cacheTag = cacheTag; } } diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java similarity index 77% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java index e5c013ca8..0484f4cf9 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java @@ -1,14 +1,12 @@ -package org.fdroid.fdroid.net.bluetooth.httpish.headers; - -import org.fdroid.fdroid.net.bluetooth.FileDetails; +package org.fdroid.fdroid.nearby.httpish; import java.util.Locale; public abstract class Header { private static final Header[] VALID_HEADERS = { - new ContentLengthHeader(), - new ETagHeader(), + new ContentLengthHeader(), + new ETagHeader(), }; protected abstract String getName(); diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java similarity index 98% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java index 4523eed83..ee8687ae4 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java @@ -1,7 +1,7 @@ -package org.fdroid.fdroid.net.bluetooth.httpish; +package org.fdroid.fdroid.nearby.httpish; import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.net.bluetooth.BluetoothConnection; +import org.fdroid.fdroid.nearby.BluetoothConnection; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java similarity index 94% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java index dd999a14a..09fb39b95 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java @@ -1,10 +1,8 @@ -package org.fdroid.fdroid.net.bluetooth.httpish; +package org.fdroid.fdroid.nearby.httpish; import android.util.Log; import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.net.bluetooth.BluetoothConnection; -import org.fdroid.fdroid.net.bluetooth.FileDetails; -import org.fdroid.fdroid.net.bluetooth.httpish.headers.Header; +import org.fdroid.fdroid.nearby.BluetoothConnection; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -87,7 +85,7 @@ public class Response { /** * Extracts meaningful headers from the response into a more useful and safe - * {@link org.fdroid.fdroid.net.bluetooth.FileDetails} object. + * {@link FileDetails} object. */ public FileDetails toFileDetails() { FileDetails details = new FileDetails(); diff --git a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java index 46912bcee..15f6b7849 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java @@ -5,11 +5,11 @@ import android.support.annotation.Nullable; import android.util.Log; import org.apache.commons.io.input.BoundedInputStream; import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.net.bluetooth.BluetoothClient; -import org.fdroid.fdroid.net.bluetooth.BluetoothConnection; -import org.fdroid.fdroid.net.bluetooth.FileDetails; -import org.fdroid.fdroid.net.bluetooth.httpish.Request; -import org.fdroid.fdroid.net.bluetooth.httpish.Response; +import org.fdroid.fdroid.nearby.BluetoothClient; +import org.fdroid.fdroid.nearby.BluetoothConnection; +import org.fdroid.fdroid.nearby.httpish.FileDetails; +import org.fdroid.fdroid.nearby.httpish.Request; +import org.fdroid.fdroid.nearby.httpish.Response; import java.io.File; import java.io.IOException;