diff --git a/app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java b/app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java index ae87c4c16..db94bcfdb 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java @@ -40,5 +40,4 @@ public class AssetUtils { } return tempFile; } - } diff --git a/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java b/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java index def26f56a..99920e3fb 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java @@ -368,6 +368,5 @@ public class Netstat { ",Status=" + status + "]"; } - } } \ No newline at end of file diff --git a/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java b/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java index ff6c7a2fc..364e19161 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java @@ -445,5 +445,4 @@ public class ApkVerifierTest { } assertTrue(ApkVerifier.requestedPermissionsEqual(expectedPermissions, apk.requestedPermissions)); } - } diff --git a/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java b/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java index 9dd25bf0e..76b55de66 100644 --- a/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java +++ b/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java @@ -33,5 +33,4 @@ public class HidingManager { public static void showHideDialog(final Context context) { throw new IllegalStateException("unimplemented"); } - } diff --git a/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java b/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java index 50688fb69..37eee53f1 100644 --- a/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java +++ b/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java @@ -59,8 +59,7 @@ public class FDroidServiceInfo extends ServiceInfoImpl implements Parcelable { in.readInt(), in.readInt(), in.readByte() != 0, - readBytes(in) - ); + readBytes(in)); int addressCount = in.readInt(); for (int i = 0; i < addressCount; i++) { diff --git a/app/src/full/java/kellinwood/logging/LoggerInterface.java b/app/src/full/java/kellinwood/logging/LoggerInterface.java index 5612d199f..0c7d86f60 100644 --- a/app/src/full/java/kellinwood/logging/LoggerInterface.java +++ b/app/src/full/java/kellinwood/logging/LoggerInterface.java @@ -29,7 +29,6 @@ public interface LoggerInterface { public void error(String message, Throwable t); - public boolean isWarningEnabled(); public void warning(String message); @@ -47,6 +46,4 @@ public interface LoggerInterface { public void debug(String message); public void debug(String message, Throwable t); - - } diff --git a/app/src/full/java/kellinwood/logging/NullLoggerFactory.java b/app/src/full/java/kellinwood/logging/NullLoggerFactory.java index e24cd7350..d056a402a 100644 --- a/app/src/full/java/kellinwood/logging/NullLoggerFactory.java +++ b/app/src/full/java/kellinwood/logging/NullLoggerFactory.java @@ -66,5 +66,4 @@ public class NullLoggerFactory implements LoggerFactory { public LoggerInterface getLogger(String category) { return logger; } - } diff --git a/app/src/full/java/kellinwood/logging/StreamLogger.java b/app/src/full/java/kellinwood/logging/StreamLogger.java index 987cb0143..e5c02257f 100644 --- a/app/src/full/java/kellinwood/logging/StreamLogger.java +++ b/app/src/full/java/kellinwood/logging/StreamLogger.java @@ -32,5 +32,4 @@ public class StreamLogger extends AbstractLogger { out.print(format(level, message)); if (t != null) t.printStackTrace(out); } - } diff --git a/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java b/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java index 769383991..b3107843e 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java +++ b/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java @@ -1,4 +1,3 @@ - package kellinwood.security.zipsigner; public class AutoKeyException extends RuntimeException { diff --git a/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java b/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java index 90d0235e8..aa77dc6f4 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java +++ b/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java @@ -1,4 +1,3 @@ - package kellinwood.security.zipsigner; import java.util.Locale; @@ -31,6 +30,5 @@ public class DefaultResourceAdapter implements ResourceAdapter { default: throw new IllegalArgumentException("Unknown item " + item); } - } } diff --git a/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java index d18b744b2..79e5495ae 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java +++ b/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java @@ -14,8 +14,6 @@ * limitations under the License. */ - - package kellinwood.security.zipsigner; import org.bouncycastle.util.encoders.HexEncoder; @@ -54,9 +52,9 @@ public class HexDumpEncoder { if ((j + 2) % 4 == 0) hexOut.append(' '); int dataChar = data[j / 2]; - if (dataChar >= 32 && dataChar < 127) chrOut.append(Character.valueOf((char) dataChar)); - else chrOut.append('.'); - + if (dataChar >= 32 && dataChar < 127) { + chrOut.append(Character.valueOf((char) dataChar)); + } else chrOut.append('.'); } hexDumpOut.append(hexOut.toString()); @@ -71,5 +69,4 @@ public class HexDumpEncoder { throw new IllegalStateException(x.getClass().getName() + ": " + x.getMessage()); } } - } \ No newline at end of file diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java index 46feb6b44..eb29ec3e9 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java +++ b/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java @@ -48,5 +48,4 @@ public class ProgressEvent { public void setPriority(int priority) { this.priority = priority; } - } diff --git a/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java b/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java index 4377b7813..993749ed3 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java +++ b/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java @@ -1,4 +1,3 @@ - package kellinwood.security.zipsigner; /** @@ -17,7 +16,5 @@ public interface ResourceAdapter { COPYING_ZIP_ENTRY } - ; - public String getString(Item item, Object... args); } diff --git a/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java b/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java index cfcdab051..53668efd8 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java +++ b/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java @@ -22,25 +22,14 @@ * - removal of main() * - switch to a signature generation method that verifies * in Android recovery - * - eliminated dependency on sun.security and sun.misc APIs by + * - eliminated dependency on sun.security and sun.misc APIs by * using signature block template files. */ - package kellinwood.security.zipsigner; import android.util.Base64; -import kellinwood.logging.LoggerInterface; -import kellinwood.logging.LoggerManager; -import kellinwood.zipio.ZioEntry; -import kellinwood.zipio.ZipInput; -import kellinwood.zipio.ZipOutput; - -import javax.crypto.Cipher; -import javax.crypto.EncryptedPrivateKeyInfo; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.File; @@ -81,6 +70,17 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.regex.Pattern; +import javax.crypto.Cipher; +import javax.crypto.EncryptedPrivateKeyInfo; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; + +import kellinwood.logging.LoggerInterface; +import kellinwood.logging.LoggerManager; +import kellinwood.zipio.ZioEntry; +import kellinwood.zipio.ZipInput; +import kellinwood.zipio.ZipOutput; + /** * This is a modified copy of com.android.signapk.SignApk.java. It provides an * API to sign JAR files (including APKs and Zip/OTA updates) in @@ -134,7 +134,6 @@ public class ZipSigner { autoKeyDetect.put("e60418c4b638f20d0721e115674ca11f", "platform"); autoKeyDetect.put("3e24e49741b60c215c010dc6048fca7d", "shared"); autoKeyDetect.put("dab2cead827ef5313f28e22b6fa8479f", "testkey"); - } public ResourceAdapter getResourceAdapter() { @@ -169,14 +168,12 @@ public class ZipSigner { return SUPPORTED_KEY_MODES; } - protected String autoDetectKey(String mode, Map zioEntries) throws NoSuchAlgorithmException, IOException { boolean debug = getLogger().isDebugEnabled(); if (!mode.startsWith(MODE_AUTO)) return mode; - // Auto-determine which keys to use String keyName = null; // Start by finding the signature block file in the input. @@ -184,11 +181,11 @@ public class ZipSigner { String entryName = entry.getKey(); if (entryName.startsWith("META-INF/") && entryName.endsWith(".RSA")) { - // Compute MD5 of the first 1458 bytes, which is the size of our signature block templates -- - // e.g., the portion of the sig block file that is the same for a given certificate. + // Compute MD5 of the first 1458 bytes, which is the size of our signature block templates -- + // e.g., the portion of the sig block file that is the same for a given certificate. MessageDigest md5 = MessageDigest.getInstance("MD5"); byte[] entryData = entry.getValue().getData(); - if (entryData.length < 1458) break; // sig block too short to be a supported key + if (entryData.length < 1458) break; // sig block too short to be a supported key md5.update(entryData, 0, 1458); byte[] rawDigest = md5.digest(); @@ -202,7 +199,6 @@ public class ZipSigner { // Lookup the key name keyName = autoKeyDetect.get(md5String); - if (debug) { if (keyName != null) { getLogger().debug(String.format("Auto-determined key=%s using md5=%s", keyName, md5String)); @@ -558,7 +554,6 @@ public class ZipSigner { ZioEntry inEntry = input.get(name); inEntry.setTime(timestamp); output.write(inEntry); - } } @@ -603,7 +598,6 @@ public class ZipSigner { IOException, GeneralSecurityException { InputStream keystoreStream = null; - try { KeyStore keystore = null; if (keystoreType == null) keystoreType = KeyStore.getDefaultType(); @@ -624,7 +618,6 @@ public class ZipSigner { } } - /** * Sign the input with the default test key and certificate. * Save result to output file. @@ -635,7 +628,6 @@ public class ZipSigner { signZip(zioEntries, new FileOutputStream(outputZipFilename), outputZipFilename); } - /** * Sign the file using the given public key cert, private key, * and signature block template. The signature block template @@ -689,15 +681,12 @@ public class ZipSigner { autoKeyObservable.notifyObservers(keyName); loadKeys(keyName); - } - ZipOutput zipOutput = null; try { - zipOutput = new ZipOutput(outputStream); if (KEY_NONE.equals(keySet.getName())) { @@ -734,7 +723,6 @@ public class ZipSigner { manifest.write(ze.getOutputStream()); zipOutput.write(ze); - // CERT.SF ze = new ZioEntry(CERT_SF_NAME); ze.setTime(timestamp); @@ -782,13 +770,11 @@ public class ZipSigner { progressHelper.removeProgressListener(l); } - public static class AutoKeyObservable extends Observable { @Override public void notifyObservers(Object arg) { super.setChanged(); super.notifyObservers(arg); } - } } \ No newline at end of file diff --git a/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java index 0aa97d741..63d19424d 100644 --- a/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java +++ b/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java @@ -1,7 +1,5 @@ - package kellinwood.security.zipsigner.optional; -import kellinwood.security.zipsigner.KeySet; import org.bouncycastle.cert.jcajce.JcaCertStore; import org.bouncycastle.cms.CMSProcessableByteArray; import org.bouncycastle.cms.CMSSignedData; @@ -18,6 +16,8 @@ import org.bouncycastle.util.Store; import java.util.Collections; +import kellinwood.security.zipsigner.KeySet; + /** * */ @@ -57,5 +57,4 @@ public class SignatureBlockGenerator { throw new RuntimeException(x.getMessage(), x); } } - } diff --git a/app/src/full/java/kellinwood/zipio/CentralEnd.java b/app/src/full/java/kellinwood/zipio/CentralEnd.java index f52b44fdb..590e0dd2b 100644 --- a/app/src/full/java/kellinwood/zipio/CentralEnd.java +++ b/app/src/full/java/kellinwood/zipio/CentralEnd.java @@ -16,14 +16,14 @@ package kellinwood.zipio; +import java.io.IOException; + import kellinwood.logging.LoggerInterface; import kellinwood.logging.LoggerManager; -import java.io.IOException; - public class CentralEnd { public int signature = 0x06054b50; // end of central dir signature 4 bytes - public short numberThisDisk = 0; // number of this disk 2 bytes + public short numberThisDisk = 0; // number of this disk 2 bytes public short centralStartDisk = 0; // number of the disk with the start of the central directory 2 bytes public short numCentralEntries; // total number of entries in the central directory on this disk 2 bytes public short totalCentralEntries; // total number of entries in the central directory 2 bytes @@ -54,7 +54,6 @@ public class CentralEnd { return log; } - private void doRead(ZipInput input) throws IOException { boolean debug = getLogger().isDebugEnabled(); @@ -63,13 +62,19 @@ public class CentralEnd { if (debug) log.debug(String.format("This disk number: 0x%04x", numberThisDisk)); centralStartDisk = input.readShort(); - if (debug) log.debug(String.format("Central dir start disk number: 0x%04x", centralStartDisk)); + if (debug) { + log.debug(String.format("Central dir start disk number: 0x%04x", centralStartDisk)); + } numCentralEntries = input.readShort(); - if (debug) log.debug(String.format("Central entries on this disk: 0x%04x", numCentralEntries)); + if (debug) { + log.debug(String.format("Central entries on this disk: 0x%04x", numCentralEntries)); + } totalCentralEntries = input.readShort(); - if (debug) log.debug(String.format("Total number of central entries: 0x%04x", totalCentralEntries)); + if (debug) { + log.debug(String.format("Total number of central entries: 0x%04x", totalCentralEntries)); + } centralDirectorySize = input.readInt(); if (debug) log.debug(String.format("Central directory size: 0x%08x", centralDirectorySize)); @@ -80,11 +85,8 @@ public class CentralEnd { short zipFileCommentLen = input.readShort(); fileComment = input.readString(zipFileCommentLen); if (debug) log.debug(".ZIP file comment: " + fileComment); - - } - public void write(ZipOutput output) throws IOException { boolean debug = getLogger().isDebugEnabled(); @@ -98,8 +100,5 @@ public class CentralEnd { output.writeInt(centralStartOffset); output.writeShort((short) fileComment.length()); output.writeString(fileComment); - - } - } diff --git a/app/src/full/java/kellinwood/zipio/ZioEntry.java b/app/src/full/java/kellinwood/zipio/ZioEntry.java index 1d25a1f18..c3246bab3 100644 --- a/app/src/full/java/kellinwood/zipio/ZioEntry.java +++ b/app/src/full/java/kellinwood/zipio/ZioEntry.java @@ -16,9 +16,6 @@ package kellinwood.zipio; -import kellinwood.logging.LoggerInterface; -import kellinwood.logging.LoggerManager; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -32,6 +29,9 @@ import java.util.zip.CRC32; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; +import kellinwood.logging.LoggerInterface; +import kellinwood.logging.LoggerManager; + public class ZioEntry implements Cloneable { private ZipInput zipInput; @@ -59,7 +59,6 @@ public class ZioEntry implements Cloneable { private byte[] data = null; private ZioEntryOutputStream entryOut = null; - private static byte[] alignBytes = new byte[4]; private static LoggerInterface log; @@ -81,7 +80,6 @@ public class ZioEntry implements Cloneable { setTime(System.currentTimeMillis()); } - public ZioEntry(String name, String sourceDataFile) throws IOException { zipInput = new ZipInput(sourceDataFile); @@ -151,7 +149,9 @@ public class ZioEntry implements Cloneable { input.seek(localHeaderOffset); - if (debug) getLogger().debug(String.format("FILE POSITION: 0x%08x", input.getFilePointer())); + if (debug) { + getLogger().debug(String.format("FILE POSITION: 0x%08x", input.getFilePointer())); + } // 0 4 Local file header signature = 0x04034b50 int signature = input.readInt(); @@ -171,12 +171,16 @@ public class ZioEntry implements Cloneable { // 4 2 Version needed to extract (minimum) /* versionRequired */ tmpShort = input.readShort(); - if (debug) log.debug(String.format("Version required: 0x%04x", tmpShort /*versionRequired*/)); + if (debug) { + log.debug(String.format("Version required: 0x%04x", tmpShort /*versionRequired*/)); + } // 6 2 General purpose bit flag /* generalPurposeBits */ tmpShort = input.readShort(); - if (debug) log.debug(String.format("General purpose bits: 0x%04x", tmpShort /* generalPurposeBits */)); + if (debug) { + log.debug(String.format("General purpose bits: 0x%04x", tmpShort /* generalPurposeBits */)); + } // 8 2 Compression method /* compression */ @@ -186,12 +190,16 @@ public class ZioEntry implements Cloneable { // 10 2 File last modification time /* modificationTime */ tmpShort = input.readShort(); - if (debug) log.debug(String.format("Modification time: 0x%04x", tmpShort /* modificationTime */)); + if (debug) { + log.debug(String.format("Modification time: 0x%04x", tmpShort /* modificationTime */)); + } // 12 2 File last modification date /* modificationDate */ tmpShort = input.readShort(); - if (debug) log.debug(String.format("Modification date: 0x%04x", tmpShort /* modificationDate */)); + if (debug) { + log.debug(String.format("Modification date: 0x%04x", tmpShort /* modificationDate */)); + } // 14 4 CRC-32 /* crc32 */ @@ -216,7 +224,7 @@ public class ZioEntry implements Cloneable { short extraLen = input.readShort(); if (debug) log.debug(String.format("Extra length: 0x%04x", extraLen)); - // 30 n File name + // 30 n File name String filename = input.readString(fileNameLen); if (debug) log.debug("Filename: " + filename); @@ -226,7 +234,6 @@ public class ZioEntry implements Cloneable { // Record the file position of this entry's data. dataPosition = input.getFilePointer(); if (debug) log.debug(String.format("Data position: 0x%08x", dataPosition)); - } public void writeLocalEntry(ZipOutput output) throws IOException { @@ -278,7 +285,6 @@ public class ZioEntry implements Cloneable { } } - // 28 2 Extra field length (m) output.writeShort((short) (extraData.length + numAlignBytes)); @@ -293,10 +299,14 @@ public class ZioEntry implements Cloneable { output.writeBytes(alignBytes, 0, numAlignBytes); } - if (debug) getLogger().debug(String.format(Locale.ENGLISH, "Data position 0x%08x", output.getFilePointer())); + if (debug) { + getLogger().debug(String.format(Locale.ENGLISH, "Data position 0x%08x", output.getFilePointer())); + } if (data != null) { output.writeBytes(data); - if (debug) getLogger().debug(String.format(Locale.ENGLISH, "Wrote %d bytes", data.length)); + if (debug) { + getLogger().debug(String.format(Locale.ENGLISH, "Wrote %d bytes", data.length)); + } } else { if (debug) getLogger().debug(String.format("Seeking to position 0x%08x", dataPosition)); @@ -310,7 +320,9 @@ public class ZioEntry implements Cloneable { int numRead = zipInput.in.read(buffer, 0, (int) Math.min(compressedSize - totalCount, bufferSize)); if (numRead > 0) { output.writeBytes(buffer, 0, numRead); - if (debug) getLogger().debug(String.format(Locale.ENGLISH, "Wrote %d bytes", numRead)); + if (debug) { + getLogger().debug(String.format(Locale.ENGLISH, "Wrote %d bytes", numRead)); + } totalCount += numRead; } else throw new IllegalStateException(String.format(Locale.ENGLISH, "EOF reached while copying %s with %d bytes left to go", filename, compressedSize - totalCount)); @@ -401,7 +413,7 @@ public class ZioEntry implements Cloneable { localHeaderOffset = input.readInt(); if (debug) log.debug(String.format("Local header offset: 0x%08x", localHeaderOffset)); - // 30 n File name + // 30 n File name filename = input.readString(fileNameLen); if (debug) log.debug("Filename: " + filename); @@ -418,7 +430,6 @@ public class ZioEntry implements Cloneable { compression = 0; crc32 = 0; } - } /** @@ -441,12 +452,12 @@ public class ZioEntry implements Cloneable { return tmpdata; } - // Returns an input stream for reading the entry's data. + // Returns an input stream for reading the entry's data. public InputStream getInputStream() throws IOException { return getInputStream(null); } - // Returns an input stream for reading the entry's data. + // Returns an input stream for reading the entry's data. public InputStream getInputStream(OutputStream monitorStream) throws IOException { if (entryOut != null) { @@ -459,8 +470,8 @@ public class ZioEntry implements Cloneable { InputStream rawis = new ByteArrayInputStream(data); if (compression == 0) return rawis; else { - // Hacky, inflate using a sequence of input streams that returns 1 byte more than the actual length of the data. - // This extra dummy byte is required by InflaterInputStream when the data doesn't have the header and crc fields (as it is in zip files). + // Hacky, inflate using a sequence of input streams that returns 1 byte more than the actual length of the data. + // This extra dummy byte is required by InflaterInputStream when the data doesn't have the header and crc fields (as it is in zip files). return new InflaterInputStream(new SequenceInputStream(rawis, new ByteArrayInputStream(new byte[1])), new Inflater(true)); } } @@ -469,8 +480,8 @@ public class ZioEntry implements Cloneable { dataStream = new ZioEntryInputStream(this); if (monitorStream != null) dataStream.setMonitorStream(monitorStream); if (compression != 0) { - // Note: When using nowrap=true with Inflater it is also necessary to provide - // an extra "dummy" byte as input. This is required by the ZLIB native library + // Note: When using nowrap=true with Inflater it is also necessary to provide + // an extra "dummy" byte as input. This is required by the ZLIB native library // in order to support certain optimizations. dataStream.setReturnDummyByte(true); return new InflaterInputStream(dataStream, new Inflater(true)); @@ -483,11 +494,9 @@ public class ZioEntry implements Cloneable { return entryOut; } - public void write(ZipOutput output) throws IOException { boolean debug = getLogger().isDebugEnabled(); - output.writeInt(0x02014b50); output.writeShort(versionMadeBy); output.writeShort(versionRequired); @@ -510,7 +519,6 @@ public class ZioEntry implements Cloneable { output.writeBytes(extraData); if (numAlignBytes > 0) output.writeBytes(alignBytes, 0, numAlignBytes); output.writeString(fileComment); - } /* @@ -628,5 +636,4 @@ public class ZioEntry implements Cloneable { public ZipInput getZipInput() { return zipInput; } - } diff --git a/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java b/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java index 2d01f919c..e0567ad7e 100644 --- a/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java +++ b/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java @@ -16,15 +16,14 @@ package kellinwood.zipio; -import kellinwood.logging.LoggerInterface; -import kellinwood.logging.LoggerManager; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.RandomAccessFile; import java.util.Locale; +import kellinwood.logging.LoggerInterface; +import kellinwood.logging.LoggerManager; /** * Input stream used to read just the data from a zip file entry. @@ -48,14 +47,15 @@ public class ZioEntryInputStream extends InputStream { raf = entry.getZipInput().in; long dpos = entry.getDataPosition(); if (dpos >= 0) { - if (debug) log.debug(String.format(Locale.ENGLISH, "Seeking to %d", entry.getDataPosition())); + if (debug) { + log.debug(String.format(Locale.ENGLISH, "Seeking to %d", entry.getDataPosition())); + } raf.seek(entry.getDataPosition()); } else { - // seeks to, then reads, the local header, causing the + // seeks to, then reads, the local header, causing the // file pointer to be positioned at the start of the data. entry.readLocalHeader(); } - } public void setReturnDummyByte(boolean returnExtraByte) { @@ -120,7 +120,9 @@ public class ZioEntryInputStream extends InputStream { if (monitor != null) monitor.write(b, off, numRead); offset += numRead; } - if (debug) log.debug(String.format(Locale.ENGLISH, "Read %d bytes for read(b,%d,%d)", numRead, off, len)); + if (debug) { + log.debug(String.format(Locale.ENGLISH, "Read %d bytes for read(b,%d,%d)", numRead, off, len)); + } return numRead; } @@ -137,5 +139,3 @@ public class ZioEntryInputStream extends InputStream { return numToSkip; } } - - diff --git a/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java b/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java index 2ce56c2f8..e9625d730 100644 --- a/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java +++ b/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java @@ -23,7 +23,7 @@ import java.util.zip.Deflater; import java.util.zip.DeflaterOutputStream; public class ZioEntryOutputStream extends OutputStream { - int size = 0; // tracks uncompressed size of data + int size = 0; // tracks uncompressed size of data CRC32 crc = new CRC32(); int crcValue = 0; OutputStream wrapped; @@ -82,6 +82,4 @@ public class ZioEntryOutputStream extends OutputStream { public OutputStream getWrappedStream() { return wrapped; } - } - diff --git a/app/src/full/java/kellinwood/zipio/ZipInput.java b/app/src/full/java/kellinwood/zipio/ZipInput.java index aaa3ce059..c74b6fee4 100644 --- a/app/src/full/java/kellinwood/zipio/ZipInput.java +++ b/app/src/full/java/kellinwood/zipio/ZipInput.java @@ -16,9 +16,6 @@ package kellinwood.zipio; -import kellinwood.logging.LoggerInterface; -import kellinwood.logging.LoggerManager; - import java.io.Closeable; import java.io.File; import java.io.IOException; @@ -33,6 +30,9 @@ import java.util.jar.Manifest; import java.util.regex.Matcher; import java.util.regex.Pattern; +import kellinwood.logging.LoggerInterface; +import kellinwood.logging.LoggerManager; + /** * */ @@ -73,7 +73,6 @@ public class ZipInput implements Closeable { return zipInput; } - public ZioEntry getEntry(String filename) { return zioEntries.get(filename); } @@ -88,7 +87,9 @@ public class ZipInput implements Closeable { * to get the root entries. */ public Collection list(String path) { - if (!path.endsWith("/")) throw new IllegalArgumentException("Invalid path -- does not end with '/'"); + if (!path.endsWith("/")) { + throw new IllegalArgumentException("Invalid path -- does not end with '/'"); + } if (path.startsWith("/")) path = path.substring(1); @@ -140,7 +141,6 @@ public class ZipInput implements Closeable { return scanForEOCDR(size * 2); } - private void doRead() { try { int bufferSize = 256; @@ -232,5 +232,3 @@ public class ZipInput implements Closeable { return in.read(b, offset, length); } } - - diff --git a/app/src/full/java/kellinwood/zipio/ZipListingHelper.java b/app/src/full/java/kellinwood/zipio/ZipListingHelper.java index 41bde0ba7..2b22bf60f 100644 --- a/app/src/full/java/kellinwood/zipio/ZipListingHelper.java +++ b/app/src/full/java/kellinwood/zipio/ZipListingHelper.java @@ -16,13 +16,13 @@ package kellinwood.zipio; -import kellinwood.logging.LoggerInterface; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import kellinwood.logging.LoggerInterface; + /** * */ @@ -33,12 +33,13 @@ public class ZipListingHelper { public static void listHeader(LoggerInterface log) { log.debug(" Length Method Size Ratio Date Time CRC-32 Name"); log.debug("-------- ------ ------- ----- ---- ---- ------ ----"); - } public static void listEntry(LoggerInterface log, ZioEntry entry) { int ratio = 0; - if (entry.getSize() > 0) ratio = (100 * (entry.getSize() - entry.getCompressedSize())) / entry.getSize(); + if (entry.getSize() > 0) { + ratio = (100 * (entry.getSize() - entry.getCompressedSize())) / entry.getSize(); + } log.debug(String.format(Locale.ENGLISH, "%8d %6s %8d %4d%% %s %08x %s", entry.getSize(), entry.getCompression() == 0 ? "Stored" : "Defl:N", @@ -49,5 +50,3 @@ public class ZipListingHelper { entry.getName())); } } - - diff --git a/app/src/full/java/kellinwood/zipio/ZipOutput.java b/app/src/full/java/kellinwood/zipio/ZipOutput.java index d371bf2de..71dde51c4 100644 --- a/app/src/full/java/kellinwood/zipio/ZipOutput.java +++ b/app/src/full/java/kellinwood/zipio/ZipOutput.java @@ -16,9 +16,6 @@ package kellinwood.zipio; -import kellinwood.logging.LoggerInterface; -import kellinwood.logging.LoggerManager; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -28,9 +25,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -/** - * - */ +import kellinwood.logging.LoggerInterface; +import kellinwood.logging.LoggerManager; + public class ZipOutput { static LoggerInterface log; @@ -58,7 +55,6 @@ public class ZipOutput { if (ofile.exists()) ofile.delete(); out = new FileOutputStream(ofile); if (getLogger().isDebugEnabled()) ZipListingHelper.listHeader(getLogger()); - } public ZipOutput(OutputStream os) throws IOException { @@ -80,10 +76,8 @@ public class ZipOutput { entriesWritten.add(entry); namesWritten.add(entryName); if (getLogger().isDebugEnabled()) ZipListingHelper.listEntry(getLogger(), entry); - } - public void close() throws IOException { CentralEnd centralEnd = new CentralEnd(); @@ -109,7 +103,6 @@ public class ZipOutput { return filePointer; } - public void writeInt(int value) throws IOException { byte[] data = new byte[4]; for (int i = 0; i < 4; i++) { @@ -148,7 +141,4 @@ public class ZipOutput { out.write(value, offset, length); filePointer += length; } - } - - diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java index c4c54ff3f..c9df70f7a 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java @@ -134,7 +134,6 @@ public class BluetoothServer extends Thread { } connection.closeQuietly(); - } private Response handleRequest(Request request) { @@ -344,5 +343,4 @@ public class BluetoothServer extends Thread { return null; } } - } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java index 33b5a9164..23be4ae4a 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java @@ -72,8 +72,7 @@ import fi.iki.elonen.NanoHTTPD.Response.IStatus; *

* This is mostly just synced from {@code SimpleWebServer.java} from NanoHTTPD. * - * @see - * webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java + * @see webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java */ public class LocalHTTPD extends NanoHTTPD { private static final String TAG = "LocalHTTPD"; diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java index b0e8f2bce..9115c87c6 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java @@ -374,5 +374,4 @@ public final class LocalRepoKeyStore { return wrapped.getServerAliases(keyType, issuers); } } - } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java index 82d7ed5c1..d53857284 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java @@ -295,7 +295,5 @@ public final class LocalRepoManager { } finally { attemptToDelete(indexJarUnsigned); } - } - } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java index 5229b03bd..8fb002189 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java @@ -162,5 +162,4 @@ public class SDCardScannerService extends IntentService { Utils.closeQuietly(inputStream); } } - } \ No newline at end of file diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java index 1b4eeb5c1..673c2713a 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java @@ -219,5 +219,4 @@ public class SelectAppsView extends SwapView { this(packageInfo.packageName, Utils.getApplicationLabel(context, packageInfo.packageName)); } } - } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java index 46ebf35bd..f6286c9cb 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java @@ -55,7 +55,7 @@ import java.util.Map; */ // TODO merge this with AppListActivity, perhaps there could be AppListView? public class SwapSuccessView extends SwapView { - private static final String TAG = "SwapAppsView"; + private static final String TAG = "SwapSuccessView"; public SwapSuccessView(Context context) { super(context); diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java index 40cfe50d1..002483de8 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java @@ -33,7 +33,6 @@ import android.util.Log; import org.fdroid.fdroid.views.main.NearbyViewBinder; - /** * This is just a shim to receive {@link UsbManager#ACTION_USB_ACCESSORY_ATTACHED} * events. @@ -41,7 +40,6 @@ import org.fdroid.fdroid.views.main.NearbyViewBinder; public class UsbDeviceAttachedReceiver extends BroadcastReceiver { public static final String TAG = "UsbDeviceAttachedReceiv"; - @Override public void onReceive(final Context context, Intent intent) { diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java index 83a671609..ce00dd094 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java @@ -85,10 +85,10 @@ public class WifiStateChangeService extends Worker { public static void registerReceiver(Context context) { ContextCompat.registerReceiver( - context, - new WifiStateChangeReceiver(), - new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION), - ContextCompat.RECEIVER_NOT_EXPORTED); + context, + new WifiStateChangeReceiver(), + new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION), + ContextCompat.RECEIVER_NOT_EXPORTED); } public static void start(Context context, @Nullable Intent intent) { diff --git a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java index ed30cc1fb..7d5a78de6 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java @@ -157,5 +157,4 @@ public class CalculatorActivity extends AppCompatActivity { } return s; } - } diff --git a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java index 8d7414414..51befa555 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java @@ -29,5 +29,4 @@ public class ExitActivity extends AppCompatActivity { }); } - } diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java index 51f951e57..e4f4f1c36 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java @@ -284,5 +284,4 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat builder.setView(R.layout.dialog_app_hiding); builder.create().show(); } - } diff --git a/app/src/main/java/com/google/zxing/encode/Contents.java b/app/src/main/java/com/google/zxing/encode/Contents.java index 0a8ed3341..aa5523fe9 100755 --- a/app/src/main/java/com/google/zxing/encode/Contents.java +++ b/app/src/main/java/com/google/zxing/encode/Contents.java @@ -110,5 +110,4 @@ public final class Contents { ContactsContract.Intents.Insert.SECONDARY_EMAIL_TYPE, ContactsContract.Intents.Insert.TERTIARY_EMAIL_TYPE, }; - } diff --git a/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java b/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java index 075209055..2acdc44fa 100755 --- a/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java +++ b/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java @@ -181,7 +181,6 @@ public final class QRCodeEncoder { contents = null; displayContents = null; } - } break; case Contents.Type.LOCATION: diff --git a/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java b/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java index ea14d725f..d74d63d4a 100644 --- a/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java +++ b/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java @@ -105,7 +105,7 @@ import java.util.Map; * @author Isaac Potoczny-Jones * @author Brad Drehmer * @author gcstang -*/ + */ @SuppressWarnings("LineLength") public class IntentIntegrator { @@ -438,5 +438,4 @@ public class IntentIntegrator { } } } - } diff --git a/app/src/main/java/com/google/zxing/integration/android/IntentResult.java b/app/src/main/java/com/google/zxing/integration/android/IntentResult.java index 161702cd4..b9e8e3906 100644 --- a/app/src/main/java/com/google/zxing/integration/android/IntentResult.java +++ b/app/src/main/java/com/google/zxing/integration/android/IntentResult.java @@ -86,5 +86,4 @@ public final class IntentResult { return "Format: " + formatName + '\n' + "Contents: " + contents + '\n' + "Raw bytes: (" + rawBytesLength + " bytes)\n" + "Orientation: " + orientation + '\n' + "EC level: " + errorCorrectionLevel + '\n'; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/Hasher.java b/app/src/main/java/org/fdroid/fdroid/Hasher.java index 2156f9cc8..34c0519ff 100644 --- a/app/src/main/java/org/fdroid/fdroid/Hasher.java +++ b/app/src/main/java/org/fdroid/fdroid/Hasher.java @@ -96,5 +96,4 @@ public class Hasher { } return rawdata; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/Languages.java b/app/src/main/java/org/fdroid/fdroid/Languages.java index f019b7c56..e6d629852 100644 --- a/app/src/main/java/org/fdroid/fdroid/Languages.java +++ b/app/src/main/java/org/fdroid/fdroid/Languages.java @@ -200,5 +200,4 @@ public final class Languages { new Locale("uk"), new Locale("vi"), }; - } diff --git a/app/src/main/java/org/fdroid/fdroid/NfcHelper.java b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java index eaf55b8ad..6dd15c277 100644 --- a/app/src/main/java/org/fdroid/fdroid/NfcHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java @@ -38,7 +38,7 @@ public class NfcHelper { try { appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA); Uri[] uris = { - Uri.parse("file://" + appInfo.publicSourceDir), + Uri.parse("file://" + appInfo.publicSourceDir), }; nfcAdapter.setBeamPushUris(uris, activity); } catch (PackageManager.NameNotFoundException e) { @@ -53,5 +53,4 @@ public class NfcHelper { nfcAdapter.setBeamPushUris(null, activity); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index 7b32db18f..07ae09d15 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -681,5 +681,4 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } return instance; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index 78d1411e3..1ae576407 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -111,7 +111,7 @@ public final class Utils { private static final int BUFFER_SIZE = 4096; private static final String[] FRIENDLY_SIZE_FORMAT = { - "%.0f B", "%.0f KiB", "%.1f MiB", "%.2f GiB", + "%.0f B", "%.0f KiB", "%.1f MiB", "%.2f GiB", }; private static RequestOptions iconRequestOptions; @@ -272,37 +272,37 @@ public final class Utils { } private static final String[] ANDROID_VERSION_NAMES = { - "?", // 0, undefined - "1.0", // 1 - "1.1", // 2 - "1.5", // 3 - "1.6", // 4 - "2.0", // 5 - "2.0.1", // 6 - "2.1", // 7 - "2.2", // 8 - "2.3", // 9 - "2.3.3", // 10 - "3.0", // 11 - "3.1", // 12 - "3.2", // 13 - "4.0", // 14 - "4.0.3", // 15 - "4.1", // 16 - "4.2", // 17 - "4.3", // 18 - "4.4", // 19 - "4.4W", // 20 - "5.0", // 21 - "5.1", // 22 - "6.0", // 23 - "7.0", // 24 - "7.1", // 25 - "8.0", // 26 - "8.1", // 27 - "9.0", // 28 - "10.0", // 29 - "11.0", // 30 + "?", // 0, undefined + "1.0", // 1 + "1.1", // 2 + "1.5", // 3 + "1.6", // 4 + "2.0", // 5 + "2.0.1", // 6 + "2.1", // 7 + "2.2", // 8 + "2.3", // 9 + "2.3.3", // 10 + "3.0", // 11 + "3.1", // 12 + "3.2", // 13 + "4.0", // 14 + "4.0.3", // 15 + "4.1", // 16 + "4.2", // 17 + "4.3", // 18 + "4.4", // 19 + "4.4W", // 20 + "5.0", // 21 + "5.1", // 22 + "6.0", // 23 + "7.0", // 24 + "7.1", // 25 + "8.0", // 26 + "8.1", // 27 + "9.0", // 28 + "10.0", // 29 + "11.0", // 30 }; public static String getAndroidVersionName(int sdkLevel) { diff --git a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java index fefa1f906..9051aaa93 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java @@ -39,7 +39,6 @@ public class FileCompat { // Do nothing... } } - } static void symlinkOs(SanitizedFile source, SanitizedFile dest) { @@ -75,5 +74,4 @@ public class FileCompat { Log.e(TAG, "Could not symlink " + source.getAbsolutePath() + " to " + dest.getAbsolutePath(), e); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java index 37119f9c5..bc2574362 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java @@ -31,15 +31,14 @@ public class PackageManagerCompat { if (Build.VERSION.SDK_INT >= 30) return; // not working anymore on this SDK level try { if (Build.VERSION.SDK_INT >= 24 && PrivilegedInstaller.isDefault(context)) { - mPm.setInstallerPackageName(packageName, PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME); + mPm.setInstallerPackageName( + packageName, PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME); } else { mPm.setInstallerPackageName(packageName, BuildConfig.APPLICATION_ID); } Utils.debugLog(TAG, "Installer package name for " + packageName + " set successfully"); } catch (SecurityException | IllegalArgumentException e) { - Log.e(TAG, "Could not set installer package name for " + - packageName, e); + Log.e(TAG, "Could not set installer package name for " + packageName, e); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index 21b83a548..e36056b02 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -86,6 +86,7 @@ public class App implements Comparable, Parcelable { * True if compatible with the device (i.e. if at least one apk is) */ public boolean compatible; + public Apk installedApk; // might be null if not installed public String installedSigner; public long installedVersionCode; @@ -825,5 +826,4 @@ public class App implements Comparable, Parcelable { return null; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java b/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java index 08a41ffb4..dada626b5 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java @@ -44,8 +44,17 @@ final class ContentProviderMigrator { List repos = repoDao.getRepositories(); int weight = repos.isEmpty() ? 0 : repos.get(repos.size() - 1).getWeight(); - String[] projection = new String[]{"name", "address", "pubkey", "inuse", "userMirrors", "disabledMirrors", - "username", "password"}; + String[] projection = + new String[] { + "name", + "address", + "pubkey", + "inuse", + "userMirrors", + "disabledMirrors", + "username", + "password" + }; try (Cursor c = oldDb.query("fdroid_repo", projection, null, null, null, null, null)) { while (c.moveToNext()) { String name = c.getString(c.getColumnIndexOrThrow("name")); diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 8610c1182..07f6a17f9 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -232,5 +232,4 @@ public class DBHelper { + repoItems.size() + " % " + (REPO_XML_ITEM_COUNT - 1) + " != 0"); return new LinkedList<>(); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java b/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java index 807b6e462..a27d72ae5 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java +++ b/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java @@ -66,5 +66,4 @@ public class SanitizedFile extends File { public static SanitizedFile knownSanitized(File file) { return new SanitizedFile(file); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java index ad6ad82c1..f6c1d212a 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java @@ -105,5 +105,4 @@ public class ApkFileProvider extends FileProvider { return Uri.fromFile(tempFile); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java index 67a977cd9..eb2a5fb33 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java @@ -138,5 +138,4 @@ class ApkVerifier { super(message); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java index b2f58c380..1f94eb583 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java @@ -202,5 +202,4 @@ public class DefaultInstallerActivity extends FragmentActivity { // after doing the broadcasts, finish this transparent wrapper activity finish(); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java index d53bd4030..df5f46e44 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java @@ -41,6 +41,7 @@ public class FileInstallerActivity extends FragmentActivity { private App app; private Apk apk; private Uri localApkUri; + /** * @see InstallManagerService */ @@ -77,7 +78,6 @@ public class FileInstallerActivity extends FragmentActivity { } else { throw new IllegalStateException("Intent action not specified!"); } - } private boolean hasStoragePermission() { diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java index 659838666..683d5198c 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java @@ -50,13 +50,14 @@ public class InstallHistoryService extends JobIntentService { public static final String TAG = "InstallHistoryService"; private static final int JOB_ID = TAG.hashCode(); - public static final Uri LOG_URI = Uri.parse("content://" + Installer.AUTHORITY + "/install_history/all"); + public static final Uri LOG_URI = + Uri.parse("content://" + Installer.AUTHORITY + "/install_history/all"); private static BroadcastReceiver broadcastReceiver; public static void register(Context context) { if (broadcastReceiver != null) { - return; // already registered + return; // already registered } IntentFilter intentFilter = new IntentFilter(); intentFilter.addDataScheme("http"); diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java b/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java index 67fb798fb..6e26d216d 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java @@ -245,5 +245,4 @@ public class SessionInstallManager extends BroadcastReceiver { // TODO check targetSdk Android 14 sources have been published, just a guess so far return Build.VERSION.SDK_INT == 34 && targetSdk >= 31; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java index f2452eaa3..414379cbb 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java @@ -39,5 +39,4 @@ class SessionInstaller extends Installer { // may not always be unattended, but no easy way to find out up-front return SessionInstallManager.canBeUsed(context); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java index f7c34dc3d..e3c26e052 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java @@ -14,5 +14,4 @@ class BluetoothConstants { // This UUID is just from mashing random hex characters on the keyboard. return UUID.fromString("cd59ba31-5729-b3bb-cb29-732b59eb61aa"); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java index 53c2bbd9e..54cbb855a 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java @@ -10,5 +10,4 @@ public class ContentLengthHeader extends Header { public void handle(FileDetails details, String value) { details.setFileSize(Integer.parseInt(value)); } - } \ No newline at end of file diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java index 1b00fbe4f..b56c98361 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java @@ -10,5 +10,4 @@ public class ETagHeader extends Header { public void handle(FileDetails details, String value) { details.setCacheTag(value); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java index 0484f4cf9..feb6bd1e4 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java @@ -22,5 +22,4 @@ public abstract class Header { } } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java index d5542f7ff..06cf1d4e0 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java @@ -190,7 +190,6 @@ public final class Request { } else { break; } - } return headers; } @@ -202,5 +201,4 @@ public final class Request { public String getMethod() { return method; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java index c0f5613d6..bf2660869 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java @@ -117,7 +117,6 @@ public class Response { } output.flush(); - } public static class Builder { @@ -163,6 +162,5 @@ public class Response { return new Response(statusCode, headers, contentStream); } - } } 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 a881a8965..5279f1a7c 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java @@ -109,5 +109,4 @@ public class BluetoothDownloader extends Downloader { connection.closeQuietly(); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java index 7b7a8294c..fa2ad4db8 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java @@ -95,7 +95,7 @@ public class TreeUriDownloader extends Downloader { @Override public boolean hasChanged() { - return true; // TODO how should this actually be implemented? + return true; // TODO how should this actually be implemented? } @Override diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 29ebd78f0..3eb04e9e5 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -130,7 +130,6 @@ public class AppSecurityPermissions { DrawableCompat.setTint(wrappedIconDrawable, theme == Preferences.Theme.light ? Color.BLACK : Color.WHITE); return wrappedIconDrawable; } - } // PermissionInfo implements Parcelable but its Parcel constructor is private and thus cannot be extended. @@ -233,7 +232,6 @@ public class AppSecurityPermissions { dialog.dismiss(); } } - } private AppSecurityPermissions(Context context) { diff --git a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java index 44b246dc4..c5088e7f6 100644 --- a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java +++ b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java @@ -45,7 +45,6 @@ public class CameraCharacteristicsMinApiLevel21 extends CameraCharacteristicsChe Log.e(TAG, e.getMessage(), e); throw new FDroidDeviceException("Exception accessing the camera list", e); } - } @NonNull @@ -106,5 +105,4 @@ public class CameraCharacteristicsMinApiLevel21 extends CameraCharacteristicsChe private boolean isAutofocus(final int mode) { return mode != android.hardware.camera2.CameraMetadata.CONTROL_AF_MODE_OFF; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java index 86b35b9f6..362c85dc5 100644 --- a/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java +++ b/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java @@ -36,5 +36,4 @@ public class StartupReceiver extends BroadcastReceiver { Utils.debugLog(TAG, "received unsupported Intent " + intent); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java index 3c2cb2dc5..79f554aa0 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java @@ -516,7 +516,6 @@ public class AppDetailsActivity extends AppCompatActivity // Ignore. break; } - } private final BroadcastReceiver appStatusReceiver = new BroadcastReceiver() { @@ -846,5 +845,4 @@ public class AppDetailsActivity extends AppCompatActivity } startUninstall(); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 9f5fc21dc..e769384dc 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -96,7 +96,6 @@ public class AppDetailsRecyclerViewAdapter void installCancel(); void launchApk(); - } private static final int VIEWTYPE_HEADER = 0; diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java b/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java index 2c960d0e9..fc9dbbc07 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java @@ -131,7 +131,6 @@ public class AntiFeaturesListingView extends RecyclerView { antiFeatureText = itemView.findViewById(R.id.anti_feature_text); antiFeatureReason = itemView.findViewById(R.id.anti_feature_reason); } - } private static String getAntiFeatureDescriptionText(Context context, String antiFeatureName) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java index efd6a631e..3b0a5ae57 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java @@ -137,5 +137,4 @@ public class AppListItemState { this.checkBoxChecked = checked; return this; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java index bb2e94e4a..fb0f46473 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java @@ -40,7 +40,7 @@ class AppPreviewAdapter extends RecyclerView.Adapter { void setAppCursor(List items) { if (this.items == items) { - //don't notify when the cursor did not change + // don't notify when the cursor did not change return; } this.items = items; diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java index c492627f8..45cb1235d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java @@ -157,5 +157,4 @@ class CategoriesViewBinder implements Observer> { }); return items; } - -} +} \ No newline at end of file diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java index 29f721600..740eb56a3 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java @@ -108,7 +108,7 @@ public class LatestAdapter extends RecyclerView.Adapter { public void setApps(@Nullable List apps) { if (this.apps == apps) { - //don't notify when the apps did not change + // don't notify when the apps did not change return; } this.apps = apps; diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java index 3824ddbad..719a09dac 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java @@ -401,5 +401,4 @@ public class MainActivity extends AppCompatActivity { return false; } } - } \ No newline at end of file diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java b/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java index 6617dae27..0259fc78d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java @@ -80,5 +80,4 @@ public class SettingsView extends FrameLayout { currentTransaction = null; activity.getSupportFragmentManager().executePendingTransactions(); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java index 99d971769..889b0a31b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java @@ -66,5 +66,4 @@ public class UpdatesItemTouchCallback extends ItemTouchHelper.Callback { public boolean isItemViewSwipeEnabled() { return true; } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java index 99a0502bc..2ebe5b268 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java @@ -57,5 +57,4 @@ public class AppStatus extends AppUpdateData { ((AppStatusListItemController) holder).bindModel(app.status.app, app.status.apk, app.status); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java index 8ba2978d8..9428e1ab5 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java @@ -63,9 +63,7 @@ public class AppStatusListItemController extends AppListItemController { final AppUpdateStatus appUpdateStatus = manager.get(status.getCanonicalUrl()); manager.removeApk(status.getCanonicalUrl()); - switch (status.status) { - case Downloading: cancelDownload(); Snackbar.make(itemView, R.string.app_list__dismiss_downloading_app, Snackbar.LENGTH_SHORT).show(); @@ -89,5 +87,4 @@ public class AppStatusListItemController extends AppListItemController { adapter.refreshItems(); } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java index a7a5f8d5f..1256a65d5 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java @@ -62,5 +62,4 @@ public class KnownVulnApp extends AppUpdateData { ((KnownVulnAppListItemController) holder).bindModel(app.app, app.apk, null); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java index b51308e93..3978d5f1c 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java @@ -60,5 +60,4 @@ public class UpdateableApp extends AppUpdateData { ((UpdateableAppListItemController) holder).bindModel(app.app, app.apk, null); } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java index 0210fed13..22dddc3ca 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java @@ -118,5 +118,4 @@ public class UpdateableAppsHeader extends AppUpdateData { } } } - } diff --git a/app/src/main/res/drawable/ic_video.xml b/app/src/main/res/drawable/ic_video.xml index 0b7b5f603..5e7ea52c4 100644 --- a/app/src/main/res/drawable/ic_video.xml +++ b/app/src/main/res/drawable/ic_video.xml @@ -1,10 +1,10 @@ - - + + \ No newline at end of file diff --git a/app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java b/app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java index 0ba81725f..561f6398e 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java @@ -43,7 +43,6 @@ public class SanitizedFileTest { assertEquals("safe", safeSanitized.getName()); assertEquals("safe-and_bleh.boo", nonEvilSanitized.getName()); assertEquals("rm etcshadow", evilSanitized.getName()); - } @Test diff --git a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java b/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java index 1e9ced926..aab71e7d0 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java @@ -138,5 +138,4 @@ public class SuggestedVersionTest { AppPrefs appPrefs = new AppPrefs(app.packageName, 0, Collections.singletonList(releaseChannel)); assertEquals(hasUpdates, app.hasUpdates(apks, appPrefs)); } - } diff --git a/app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java b/app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java index 0b6a47161..bd8d8a9ba 100644 --- a/app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java +++ b/app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java @@ -21,5 +21,4 @@ public class MainActivityTest { assertNotEquals(invalid, MainActivity.sanitizeSearchTerms(invalid)); } } - } diff --git a/app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java b/app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java index e50965e56..ba7492e84 100644 --- a/app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java +++ b/app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java @@ -1,6 +1,8 @@ package kellinwood.security.zipsigner; -import kellinwood.security.zipsigner.ZipSigner; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.apache.commons.io.IOUtils; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.operator.OperatorCreationException; @@ -10,7 +12,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; @@ -26,23 +27,20 @@ import java.security.PrivateKey; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.jar.JarEntry; -import java.util.jar.JarFile; import java.util.jar.JarOutputStream; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * This test the JAR signing functions of {@link ZipSigner}. */ @RunWith(RobolectricTestRunner.class) -@Config(sdk={23, 25, 32}) // minSdkVersion, targetSdkVersion, max SDK supported by Robolectric +@Config(sdk = {23, 25, 32}) // minSdkVersion, targetSdkVersion, max SDK supported by Robolectric public class ZipSignerTest { public static final String TAG = "ZipSignerTest"; private File unsigned; private File signed; - + @Before public void setUp() { ShadowLog.stream = System.out; @@ -60,7 +58,7 @@ public class ZipSignerTest { fail(); } } - + @After public void tearDown() { if (unsigned != null) { @@ -74,7 +72,7 @@ public class ZipSignerTest { @Test public void testSignApk() throws CertificateException, ClassNotFoundException, GeneralSecurityException, IllegalAccessException, InstantiationException, IOException, NoSuchAlgorithmException, OperatorCreationException { - + System.out.println("wrote " + unsigned); assertTrue(unsigned.exists()); assertTrue(unsigned.length() > 0); @@ -92,5 +90,5 @@ public class ZipSignerTest { assertTrue(signed.exists()); assertTrue(signed.length() > unsigned.length()); - } + } } diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java index b3565a6b8..d1f141ccc 100644 --- a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java +++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java @@ -19,7 +19,6 @@ import org.robolectric.shadows.ShadowLog; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - /** * Test that this can start and stop the webserver. */