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

Apply a few suggestions from Android Studio

Browse Source
This commit is contained in:
Daniel Martí 2016-04-23 17:47:35 +01:00
parent 145314a83a
commit f1230adfc1
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/fdroid/fdroid/AndroidXMLDecompress.java
View File

@ -68,7 +68,7 @@ import java.util.zip.ZipFile;
* @see <a href="https://stackoverflow.com/a/4761689">a binary XML parser</a> * @see <a href="https://stackoverflow.com/a/4761689">a binary XML parser</a>
*/ */
public class AndroidXMLDecompress { public class AndroidXMLDecompress {
public static int startTag = 0x00100102; public static final int START_TAG = 0x00100102;
/** /**
* Just get the XML attributes from the {@code <manifest>} element. * Just get the XML attributes from the {@code <manifest>} element.
@ -82,7 +82,7 @@ public class AndroidXMLDecompress {
int stringTableOffset = stringIndexTableOffset + numbStrings * 4; int stringTableOffset = stringIndexTableOffset + numbStrings * 4;
int xmlTagOffset = littleEndianWord(binaryXml, 3 * 4); int xmlTagOffset = littleEndianWord(binaryXml, 3 * 4);
for (int i = xmlTagOffset; i < binaryXml.length - 4; i += 4) { for (int i = xmlTagOffset; i < binaryXml.length - 4; i += 4) {
if (littleEndianWord(binaryXml, i) == startTag) { if (littleEndianWord(binaryXml, i) == START_TAG) {
xmlTagOffset = i; xmlTagOffset = i;
break; break;
} }
@ -92,11 +92,11 @@ public class AndroidXMLDecompress {
while (offset < binaryXml.length) { while (offset < binaryXml.length) {
int tag0 = littleEndianWord(binaryXml, offset); int tag0 = littleEndianWord(binaryXml, offset);
if (tag0 == startTag) { if (tag0 == START_TAG) {
int numbAttrs = littleEndianWord(binaryXml, offset + 7 * 4); int numbAttrs = littleEndianWord(binaryXml, offset + 7 * 4);
offset += 9 * 4; offset += 9 * 4;
HashMap<String, Object> attributes = new HashMap<String, Object>(3); HashMap<String, Object> attributes = new HashMap<>(3);
for (int i = 0; i < numbAttrs; i++) { for (int i = 0; i < numbAttrs; i++) {
int attributeNameStringIndex = littleEndianWord(binaryXml, offset + 1 * 4); int attributeNameStringIndex = littleEndianWord(binaryXml, offset + 1 * 4);
int attributeValueStringIndex = littleEndianWord(binaryXml, offset + 2 * 4); int attributeValueStringIndex = littleEndianWord(binaryXml, offset + 2 * 4);
@ -117,7 +117,7 @@ public class AndroidXMLDecompress {
// we only need the first <manifest> start tag // we only need the first <manifest> start tag
break; break;
} }
return new HashMap<String, Object>(0); return new HashMap<>(0);
} }
public static byte[] getManifestFromFilename(String filename) throws IOException { public static byte[] getManifestFromFilename(String filename) throws IOException {
@ -137,9 +137,7 @@ public class AndroidXMLDecompress {
is.read(buf); is.read(buf);
is.close(); is.close();
if (zip != null) { zip.close();
zip.close();
}
return buf; return buf;
} }

3
app/src/main/java/org/fdroid/fdroid/AppDetails.java
View File

@ -865,8 +865,7 @@ public class AppDetails extends AppCompatActivity {
} }
private void startDownload(Apk apk, String repoAddress) { private void startDownload(Apk apk, String repoAddress) {
String urlString = Utils.getApkUrl(repoAddress, apk); activeDownloadUrlString = Utils.getApkUrl(repoAddress, apk);
activeDownloadUrlString = urlString;
registerDownloaderReceivers(); registerDownloaderReceivers();
headerFragment.startProgress(); headerFragment.startProgress();
DownloaderService.queue(this, apk.packageName, activeDownloadUrlString); DownloaderService.queue(this, apk.packageName, activeDownloadUrlString);

5
app/src/main/java/org/fdroid/fdroid/installer/Installer.java
View File

@ -162,10 +162,7 @@ public abstract class Installer {
return false; return false;
} }
Hasher hasher = new Hasher(hashType, apkFile); Hasher hasher = new Hasher(hashType, apkFile);
if (hasher != null && hasher.match(hash)) { return hasher.match(hash);
return true;
}
return false;
} }
/** /**

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

@ -94,7 +94,7 @@ public class DownloaderService extends Service {
private static volatile Downloader downloader; private static volatile Downloader downloader;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private static final HashMap<String, Integer> QUEUE_WHATS = new HashMap<String, Integer>(); private static final HashMap<String, Integer> QUEUE_WHATS = new HashMap<>();
private int what; private int what;
private final class ServiceHandler extends Handler { private final class ServiceHandler extends Handler {