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

move ".net.bluetooth" into ".nearby" package

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2019-06-17 10:39:49 +02:00
parent 15d349f863
commit 32aad6b562
13 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.

2
app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java → app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net.bluetooth;
package org.fdroid.fdroid.nearby;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;

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

@ -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;

6
app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java → app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
View File

@ -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;

2
app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java → app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net.bluetooth;
package org.fdroid.fdroid.nearby;
import android.bluetooth.BluetoothSocket;
import org.fdroid.fdroid.Utils;

2
app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java → app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.net.bluetooth;
package org.fdroid.fdroid.nearby;
import java.util.UUID;

4
app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java → app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
View File

@ -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 {

4
app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java → app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
View File

@ -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 {

6
app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java → app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
View File

@ -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;
}
}

8
app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java → app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
View File

@ -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();

4
app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java → app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
View File

@ -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;

8
app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java → app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
View File

@ -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();

10
app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
View File

@ -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;