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

Remove some useless null checks

Browse Source
This commit is contained in:
Daniel Martí 2015-04-15 18:02:09 +02:00
parent 801ec4e7fa
commit 1d16a6edee
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -103,10 +103,7 @@ public class RepoXMLHandler extends DefaultHandler {
super.endElement(uri, localName, qName); super.endElement(uri, localName, qName);
final String curel = localName; final String curel = localName;
String str = curchars.toString(); String str = curchars.toString().trim();
if (str != null) {
str = str.trim();
}
if (curel.equals("application") && curapp != null) { if (curel.equals("application") && curapp != null) {
apps.add(curapp); apps.add(curapp);
@ -122,7 +119,7 @@ public class RepoXMLHandler extends DefaultHandler {
} else if (curel.equals("package") && curapk != null && curapp != null) { } else if (curel.equals("package") && curapk != null && curapp != null) {
apksList.add(curapk); apksList.add(curapk);
curapk = null; curapk = null;
} else if (curapk != null && str != null) { } else if (curapk != null) {
switch (curel) { switch (curel) {
case "version": case "version":
curapk.version = str; curapk.version = str;
@ -172,7 +169,7 @@ public class RepoXMLHandler extends DefaultHandler {
curapk.nativecode = Utils.CommaSeparatedList.make(str); curapk.nativecode = Utils.CommaSeparatedList.make(str);
break; break;
} }
} else if (curapp != null && str != null) { } else if (curapp != null) {
switch (curel) { switch (curel) {
case "name": case "name":
curapp.name = str; curapp.name = str;

4
F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
View File

@ -212,10 +212,6 @@ public class LocalRepoService extends Service {
LocalRepoService.this, LocalRepoService.this,
getFilesDir(), getFilesDir(),
Preferences.get().isLocalRepoHttpsEnabled()); Preferences.get().isLocalRepoHttpsEnabled());
if (localHttpd == null) {
Log.e(TAG, "localHttpd == null!");
return;
}
Looper.prepare(); // must be run before creating a Handler Looper.prepare(); // must be run before creating a Handler
webServerThreadHandler = new Handler() { webServerThreadHandler = new Handler() {