--- /home/hans/code/fdroid/data/tmp/org.fdroid.fdroid_101004.apk
+++ /home/hans/code/fdroid/data/tmp/sigcp_org.fdroid.fdroid_101004.apk
├── zipinfo {}
│ @@ -1,13 +1,11 @@
│ -Zip file size: 4659390 bytes, number of entries: 665
│ +Zip file size: 4657814 bytes, number of entries: 665
│  -rw----     2.0 fat    65033 bl defN 08-Jan-01 00:00 META-INF/MANIFEST.MF
│  -rw----     2.0 fat    65154 bl defN 08-Jan-01 00:00 META-INF/CIARANG.SF
│  -rw----     2.0 fat     1342 bl defN 08-Jan-01 00:00 META-INF/CIARANG.RSA
│ --rw----     2.0 fat      701 bl defN 08-Jan-01 00:00 META-INF/rxandroid.properties
│ --rw----     2.0 fat      619 bl defN 08-Jan-01 00:00 META-INF/rxjava.properties
│  -rw----     2.0 fat       41 bl defN 08-Jan-01 00:00 META-INF/buildserverid
│  -rw----     2.0 fat       41 bl defN 08-Jan-01 00:00 META-INF/fdroidserverid
│  -rw----     2.0 fat    27200 bX defN 08-Jan-01 00:00 AndroidManifest.xml
│  -rw----     2.0 fat     2893 bl defN 08-Jan-01 00:00 assets/index.template.html
│  -rw----     1.0 fat     3558 b- stor 08-Jan-01 00:00 assets/swap-icon.png
│  -rw----     2.0 fat     2012 bl defN 08-Jan-01 00:00 assets/swap-icon.svg
│  -rw----     1.0 fat     1245 b- stor 08-Jan-01 00:00 assets/swap-tick-done.png
│ @@ -657,11 +655,13 @@
│  -rw----     2.0 fat      596 bl defN 08-Jan-01 00:00 res/menu/swap_next_search.xml
│  -rw----     2.0 fat      456 bl defN 08-Jan-01 00:00 res/menu/swap_search.xml
│  -rw----     2.0 fat      456 bl defN 08-Jan-01 00:00 res/menu/swap_skip.xml
│  -rw----     2.0 fat      268 bl defN 08-Jan-01 00:00 res/xml/apk_file_provider.xml
│  -rw----     2.0 fat     4136 bl defN 08-Jan-01 00:00 res/xml/preferences.xml
│  -rw----     2.0 fat      312 bl defN 08-Jan-01 00:00 res/xml/searchable.xml
│  -rw----     1.0 fat  1225568 b- stor 08-Jan-01 00:00 resources.arsc
│ --rw----     2.0 fat  6293964 bl defN 08-Jan-01 00:00 classes.dex
│ +-rw----     2.0 fat  6293840 bl defN 08-Jan-01 00:00 classes.dex
│ +-rw----     2.0 fat      619 bl defN 08-Jan-01 00:00 META-INF/rxjava.properties
│  -rw----     2.0 fat    49608 bl defN 08-Jan-01 00:00 org/spongycastle/x509/CertPathReviewerMessages_de.properties
│  -rw----     2.0 fat    42868 bl defN 08-Jan-01 00:00 org/spongycastle/x509/CertPathReviewerMessages.properties
│ -665 files, 8653627 bytes uncompressed, 4544764 bytes compressed:  47.5%
│ +-rw----     2.0 fat      701 bl defN 08-Jan-01 00:00 META-INF/rxandroid.properties
│ +665 files, 8653503 bytes uncompressed, 4544730 bytes compressed:  47.5%
├── smali/com/google/zxing/integration/android/IntentResult.smali
│ @@ -140,21 +140,15 @@
│  
│      move-result-object v1
│  
│      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
│  
│      move-result-object v1
│  
│ -    const-string v2, " bytes)\n"
│ -
│ -    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v1
│ -
│ -    const-string v2, "Orientation: "
│ +    const-string v2, " bytes)\nOrientation: "
│  
│      invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v1
│  
│      iget-object v2, p0, Lcom/google/zxing/integration/android/IntentResult;->orientation:Ljava/lang/Integer;
├── smali/org/fdroid/fdroid/Preferences.smali
│ @@ -380,14 +380,15 @@
│      const-string v2, "-"
│  
│      .line 191
│      invoke-virtual {v0, v1, v2}, Ljava/lang/String;->replaceAll(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
│  
│      move-result-object v0
│  
│ +    .line 190
│      return-object v0
│  .end method
│  
│  .method private initialize(Ljava/lang/String;)V
│      .locals 2
│      .param p1, "key"    # Ljava/lang/String;
├── smali/org/fdroid/fdroid/Utils.smali
│ @@ -648,14 +648,15 @@
│  
│      move-object v3, v4
│  
│      .end local v4    # "output":Ljava/io/OutputStream;
│      .restart local v3    # "output":Ljava/io/OutputStream;
│      move-object v1, v2
│  
│ +    .line 154
│      .end local v2    # "input":Ljava/io/InputStream;
│      .restart local v1    # "input":Ljava/io/InputStream;
│      :goto_0
│      return v5
│  
│      .line 152
│      :catch_0
│ @@ -1114,14 +1115,15 @@
│      invoke-static {v9, v10, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
│      :try_end_2
│      .catchall {:try_start_2 .. :try_end_2} :catchall_0
│  
│      .line 398
│      invoke-static {v3}, Lorg/fdroid/fdroid/Utils;->closeQuietly(Ljava/io/Closeable;)V
│  
│ +    .line 396
│      .end local v2    # "e":Ljava/io/IOException;
│      :goto_2
│      return-object v8
│  
│      .line 388
│      .end local v3    # "fis":Ljava/io/FileInputStream;
│      .restart local v0    # "bis":Ljava/io/BufferedInputStream;
│ @@ -1146,14 +1148,15 @@
│      move-result-object v8
│  
│      .line 398
│      invoke-static {v4}, Lorg/fdroid/fdroid/Utils;->closeQuietly(Ljava/io/Closeable;)V
│  
│      move-object v3, v4
│  
│ +    .line 389
│      .end local v4    # "fis":Ljava/io/FileInputStream;
│      .restart local v3    # "fis":Ljava/io/FileInputStream;
│      goto :goto_2
│  
│      .line 394
│      .end local v0    # "bis":Ljava/io/BufferedInputStream;
│      .end local v1    # "dataBytes":[B
│ @@ -1464,14 +1467,15 @@
│      sget-object v1, Landroid/graphics/Bitmap$Config;->RGB_565:Landroid/graphics/Bitmap$Config;
│  
│      .line 357
│      invoke-virtual {v0, v1}, Lcom/nostra13/universalimageloader/core/DisplayImageOptions$Builder;->bitmapConfig(Landroid/graphics/Bitmap$Config;)Lcom/nostra13/universalimageloader/core/DisplayImageOptions$Builder;
│  
│      move-result-object v0
│  
│ +    .line 350
│      return-object v0
│  .end method
│  
│  .method public static getLocalRepoUri(Lorg/fdroid/fdroid/data/Repo;)Landroid/net/Uri;
│      .locals 5
│      .param p0, "repo"    # Lorg/fdroid/fdroid/data/Repo;
├── smali/org/fdroid/fdroid/data/ApkProvider$Query.smali
│ @@ -250,21 +250,15 @@
│  
│      invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
│  
│      invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v2
│  
│ -    const-string v3, " AS apk "
│ -
│ -    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v2
│ -
│ -    const-string v3, " LEFT JOIN "
│ +    const-string v3, " AS apk  LEFT JOIN "
│  
│      invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v2
│  
│      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
├── smali/org/fdroid/fdroid/data/ApkProvider.smali
│ @@ -443,14 +443,15 @@
│      move-result-object v0
│  
│      .line 240
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 237
│      return-object v0
│  .end method
│  
│  .method private getAppIdFromPackageNameQuery()Ljava/lang/String;
│      .locals 2
│  
│      .prologue
│ @@ -526,14 +527,15 @@
│      move-result-object v0
│  
│      .line 248
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 244
│      return-object v0
│  .end method
│  
│  .method public static getAuthority()Ljava/lang/String;
│      .locals 1
│  
│      .prologue
│ @@ -615,14 +617,15 @@
│      move-result-object v0
│  
│      .line 269
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 264
│      return-object v0
│  .end method
│  
│  .method static getContentUri(Ljava/util/List;)Landroid/net/Uri;
│      .locals 2
│      .annotation system Ldalvik/annotation/Signature;
│          value = {
│ @@ -663,14 +666,15 @@
│      move-result-object v0
│  
│      .line 291
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 288
│      return-object v0
│  .end method
│  
│  .method public static getContentUri(Lorg/fdroid/fdroid/data/Apk;)Landroid/net/Uri;
│      .locals 2
│      .param p0, "apk"    # Lorg/fdroid/fdroid/data/Apk;
│  
│ @@ -742,14 +746,15 @@
│      move-result-object v0
│  
│      .line 278
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 273
│      return-object v0
│  .end method
│  
│  .method public static getRepoUri(J)Landroid/net/Uri;
│      .locals 2
│      .param p0, "repoId"    # J
│  
│ @@ -781,14 +786,15 @@
│      move-result-object v0
│  
│      .line 256
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 252
│      return-object v0
│  .end method
│  
│  .method private queryApp(Ljava/lang/String;)Lorg/fdroid/fdroid/data/QuerySelection;
│      .locals 1
│      .param p1, "packageName"    # Ljava/lang/String;
├── smali/org/fdroid/fdroid/data/AppProvider$Query.smali
│ @@ -585,21 +585,15 @@
│  
│      const-string v4, "rowid"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, ") "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " LEFT JOIN "
│ +    const-string v4, ")  LEFT JOIN "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      const-string v4, "fdroid_repo"
├── smali/org/fdroid/fdroid/data/AppProvider.smali
│ @@ -398,14 +398,15 @@
│      move-result-object v0
│  
│      .line 440
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 437
│      return-object v0
│  .end method
│  
│  .method public static getContentUri()Landroid/net/Uri;
│      .locals 2
│  
│      .prologue
│ @@ -504,21 +505,15 @@
│  
│      const-string v3, "icon"
│  
│      invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v2
│  
│ -    const-string v3, ") "
│ -
│ -    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v2
│ -
│ -    const-string v3, " FROM "
│ +    const-string v3, ")  FROM "
│  
│      invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v2
│  
│      invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -578,21 +573,15 @@
│  
│      const-string v3, "repo"
│  
│      invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v2
│  
│ -    const-string v3, ") "
│ -
│ -    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v2
│ -
│ -    const-string v3, " WHERE "
│ +    const-string v3, ")  WHERE "
│  
│      invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v2
│  
│      invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -876,14 +865,15 @@
│      move-result-object v0
│  
│      .line 459
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 456
│      return-object v0
│  .end method
│  
│  .method public static getSearchCanUpdateUri(Ljava/lang/String;)Landroid/net/Uri;
│      .locals 2
│      .param p0, "query"    # Ljava/lang/String;
│  
│ @@ -911,14 +901,15 @@
│      move-result-object v0
│  
│      .line 494
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 490
│      return-object v0
│  .end method
│  
│  .method public static getSearchInstalledUri(Ljava/lang/String;)Landroid/net/Uri;
│      .locals 2
│      .param p0, "query"    # Ljava/lang/String;
│  
│ @@ -946,14 +937,15 @@
│      move-result-object v0
│  
│      .line 486
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 482
│      return-object v0
│  .end method
│  
│  .method public static getSearchUri(Ljava/lang/String;)Landroid/net/Uri;
│      .locals 2
│      .param p0, "query"    # Ljava/lang/String;
│  
│ @@ -966,19 +958,18 @@
│      if-eqz v0, :cond_0
│  
│      .line 473
│      invoke-static {}, Lorg/fdroid/fdroid/data/AppProvider;->getContentUri()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ -    .line 478
│ +    .line 475
│      :goto_0
│      return-object v0
│  
│ -    .line 475
│      :cond_0
│      invoke-static {}, Lorg/fdroid/fdroid/data/AppProvider;->getContentUri()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│      invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
│  
│ @@ -1043,14 +1034,15 @@
│      move-result-object v0
│  
│      .line 502
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 498
│      return-object v0
│  .end method
│  
│  .method static queryApps(Ljava/lang/String;Ljava/lang/String;)Lorg/fdroid/fdroid/data/AppProvider$AppQuerySelection;
│      .locals 4
│      .param p0, "packageNames"    # Ljava/lang/String;
│      .param p1, "packageNameField"    # Ljava/lang/String;
│ @@ -2385,21 +2377,15 @@
│  
│      const-string v4, "compatible"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, " = ( "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " SELECT TOTAL( "
│ +    const-string v4, " = (  SELECT TOTAL( "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -2413,21 +2399,15 @@
│  
│      const-string v4, "compatible"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, ") > 0 "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " FROM "
│ +    const-string v4, ") > 0  FROM "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -2705,21 +2685,15 @@
│  
│      const-string v4, "suggestedVercode"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, " = ( "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " SELECT MAX( "
│ +    const-string v4, " = (  SELECT MAX( "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -2733,21 +2707,15 @@
│  
│      const-string v4, "vercode"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, " ) "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " FROM "
│ +    const-string v4, " )  FROM "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -2793,21 +2761,15 @@
│  
│      const-string v4, "appId"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, " AND "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " ( "
│ +    const-string v4, " AND  ( "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -2843,21 +2805,15 @@
│  
│      const-string v4, "compatible"
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│ -    const-string v4, " = 1 ) ) "
│ -
│ -    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v3
│ -
│ -    const-string v4, " WHERE "
│ +    const-string v4, " = 1 ) )  WHERE "
│  
│      invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v3
│  
│      const-string v4, "upstreamVercode"
│  
│ @@ -2974,21 +2930,15 @@
│  
│      const-string v6, "suggestedVercode"
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│ -    const-string v6, " = ( "
│ -
│ -    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v5
│ -
│ -    const-string v6, " SELECT MAX( "
│ +    const-string v6, " = (  SELECT MAX( "
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│      invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -3002,21 +2952,15 @@
│  
│      const-string v6, "vercode"
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│ -    const-string v6, " ) "
│ -
│ -    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v5
│ -
│ -    const-string v6, " FROM "
│ +    const-string v6, " )  FROM "
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│      invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -3116,21 +3060,15 @@
│  
│      const-string v6, "compatible"
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│ -    const-string v6, " = 1 ) ) "
│ -
│ -    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v5
│ -
│ -    const-string v6, " WHERE "
│ +    const-string v6, " = 1 ) )  WHERE "
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│      const-string v6, "upstreamVercode"
├── smali/org/fdroid/fdroid/data/DBHelper.smali
│ @@ -804,17 +804,19 @@
│  
│      const/4 v1, -0x1
│  
│      if-eq v0, v1, :cond_0
│  
│      const/4 v0, 0x1
│  
│ +    .line 727
│      :goto_0
│      return v0
│  
│ +    .line 728
│      :cond_0
│      const/4 v0, 0x0
│  
│      goto :goto_0
│  .end method
│  
│  .method private static createAppApk(Landroid/database/sqlite/SQLiteDatabase;)V
│ @@ -1861,21 +1863,15 @@
│  
│      move-result-object v4
│  
│      invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v4
│  
│ -    const-string v5, " ) "
│ -
│ -    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v4
│ -
│ -    const-string v5, "SELECT "
│ +    const-string v5, " ) SELECT "
│  
│      invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v4
│  
│      invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│ @@ -2125,21 +2121,15 @@
│  
│      move-result-object v5
│  
│      invoke-virtual {v5, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│ -    const-string v6, " ) "
│ -
│ -    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v5
│ -
│ -    const-string v6, "SELECT id, "
│ +    const-string v6, " ) SELECT id, "
│  
│      invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v5
│  
│      invoke-virtual {v5, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
├── smali/org/fdroid/fdroid/data/InstalledAppProvider.smali
│ @@ -241,14 +241,15 @@
│      move-result-object v0
│  
│      .line 86
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 83
│      return-object v0
│  .end method
│  
│  .method private queryApp(Ljava/lang/String;)Lorg/fdroid/fdroid/data/QuerySelection;
│      .locals 4
│      .param p1, "packageName"    # Ljava/lang/String;
├── smali/org/fdroid/fdroid/data/NewRepoConfig.smali
│ @@ -505,14 +505,15 @@
│      const-string v4, "/fdroid/repo"
│  
│      .line 160
│      invoke-virtual {v2, v3, v4}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
│  
│      move-result-object v2
│  
│ +    .line 154
│      return-object v2
│  .end method
│  
│  
│  # virtual methods
│  .method public getBssid()Ljava/lang/String;
│      .locals 1
├── smali/org/fdroid/fdroid/data/RepoProvider.smali
│ @@ -105,14 +105,15 @@
│      move-result-object v0
│  
│      .line 283
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 281
│      return-object v0
│  .end method
│  
│  .method public static getAuthority()Ljava/lang/String;
│      .locals 1
│  
│      .prologue
├── smali/org/fdroid/fdroid/data/TempApkProvider.smali
│ @@ -133,14 +133,15 @@
│      move-result-object v0
│  
│      .line 61
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 56
│      return-object v0
│  .end method
│  
│  .method public static getApksUri(Lorg/fdroid/fdroid/data/Repo;Ljava/util/List;)Landroid/net/Uri;
│      .locals 4
│      .param p0, "repo"    # Lorg/fdroid/fdroid/data/Repo;
│      .annotation system Ldalvik/annotation/Signature;
│ @@ -195,14 +196,15 @@
│      move-result-object v0
│  
│      .line 70
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 65
│      return-object v0
│  .end method
│  
│  .method public static getAuthority()Ljava/lang/String;
│      .locals 1
│  
│      .prologue
├── smali/org/fdroid/fdroid/data/TempAppProvider.smali
│ @@ -305,14 +305,15 @@
│      move-result-object v0
│  
│      .line 68
│      invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
│  
│      move-result-object v0
│  
│ +    .line 65
│      return-object v0
│  .end method
│  
│  .method public static getAuthority()Ljava/lang/String;
│      .locals 1
│  
│      .prologue
├── smali/org/fdroid/fdroid/installer/ApkCache.smali
│ @@ -49,17 +49,19 @@
│  
│      move-result v1
│  
│      if-eqz v1, :cond_0
│  
│      const/4 v1, 0x1
│  
│ +    .line 113
│      :goto_0
│      return v1
│  
│ +    .line 114
│      :cond_0
│      const/4 v1, 0x0
│  
│      goto :goto_0
│  
│      .line 115
│      :catch_0
│ @@ -300,15 +302,15 @@
│      new-instance v3, Lorg/fdroid/fdroid/installer/ApkCache$1;
│  
│      invoke-direct {v3, v0}, Lorg/fdroid/fdroid/installer/ApkCache$1;-><init>(Ljava/io/File;)V
│  
│      .line 79
│      invoke-virtual {v3}, Lorg/fdroid/fdroid/installer/ApkCache$1;->start()V
│  
│ -    .line 80
│ +    .line 62
│      return-object v2
│  .end method
│  
│  .method private static getApkCacheDir(Landroid/content/Context;)Ljava/io/File;
│      .locals 3
│      .param p0, "context"    # Landroid/content/Context;
├── smali/org/fdroid/fdroid/installer/InstallManagerService.smali
│ @@ -334,14 +334,15 @@
│      const/16 v2, 0x64
│  
│      .line 299
│      invoke-virtual {v1, v2, v5, v6}, Landroid/support/v4/app/NotificationCompat$Builder;->setProgress(IIZ)Landroid/support/v4/app/NotificationCompat$Builder;
│  
│      move-result-object v1
│  
│ +    .line 290
│      return-object v1
│  .end method
│  
│  .method public static getActiveDownloadUrls()Ljava/util/Set;
│      .locals 1
│      .annotation system Ldalvik/annotation/Signature;
│          value = {
│ @@ -455,14 +456,15 @@
│      const/high16 v2, 0x8000000
│  
│      .line 318
│      invoke-virtual {v1, p1, v2}, Landroid/support/v4/app/TaskStackBuilder;->getPendingIntent(II)Landroid/app/PendingIntent;
│  
│      move-result-object v1
│  
│ +    .line 315
│      return-object v1
│  .end method
│  
│  .method private static getAppFromActive(Ljava/lang/String;)Lorg/fdroid/fdroid/data/App;
│      .locals 2
│      .param p0, "urlString"    # Ljava/lang/String;
├── smali/org/fdroid/fdroid/localrepo/SwapService.smali
│ @@ -322,14 +322,15 @@
│      move-result-object v2
│  
│      .line 571
│      invoke-virtual {v2}, Landroid/support/v4/app/NotificationCompat$Builder;->build()Landroid/app/Notification;
│  
│      move-result-object v2
│  
│ +    .line 566
│      return-object v2
│  .end method
│  
│  .method private static deserializePackages(Ljava/lang/String;)Ljava/util/Set;
│      .locals 2
│      .param p0, "packages"    # Ljava/lang/String;
│      .annotation system Ldalvik/annotation/Signature;
├── smali/org/fdroid/fdroid/net/BluetoothDownloader.smali
│ @@ -301,17 +301,19 @@
│  
│      move-result v1
│  
│      if-eqz v1, :cond_0
│  
│      const/4 v1, 0x1
│  
│ +    .line 90
│      :goto_0
│      return v1
│  
│ +    .line 92
│      :cond_0
│      const/4 v1, 0x0
│  
│      goto :goto_0
│  .end method
│  
│  .method public totalDownloadSize()I
├── smali/org/fdroid/fdroid/net/HttpDownloader.smali
│ @@ -416,17 +416,19 @@
│  
│      move-result v1
│  
│      if-eqz v1, :cond_0
│  
│      const/4 v1, 0x1
│  
│ +    .line 106
│      :goto_0
│      return v1
│  
│ +    .line 108
│      :cond_0
│      const/4 v1, 0x0
│  
│      goto :goto_0
│  .end method
│  
│  .method private setupCacheCheck()V
├── smali/org/fdroid/fdroid/net/LocalHTTPD.smali
│ @@ -662,45 +662,15 @@
│  
│      move-object/from16 v0, v17
│  
│      invoke-virtual {v0, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v17
│  
│ -    const-string v18, "</title><style><!--\n"
│ -
│ -    invoke-virtual/range {v17 .. v18}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v17
│ -
│ -    const-string v18, "span.dirname { font-weight: bold; }\n"
│ -
│ -    invoke-virtual/range {v17 .. v18}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v17
│ -
│ -    const-string v18, "span.filesize { font-size: 75%; }\n"
│ -
│ -    invoke-virtual/range {v17 .. v18}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v17
│ -
│ -    const-string v18, "// -->\n"
│ -
│ -    invoke-virtual/range {v17 .. v18}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v17
│ -
│ -    const-string v18, "</style>"
│ -
│ -    invoke-virtual/range {v17 .. v18}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│ -
│ -    move-result-object v17
│ -
│ -    const-string v18, "</head><body><h1>"
│ +    const-string v18, "</title><style><!--\nspan.dirname { font-weight: bold; }\nspan.filesize { font-size: 75%; }\n// -->\n</style></head><body><h1>"
│  
│      invoke-virtual/range {v17 .. v18}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
│  
│      move-result-object v17
│  
│      move-object/from16 v0, v17
│  
│ @@ -1453,15 +1423,15 @@
│  
│      const-string v6, "FORBIDDEN: Won\'t serve ../ for security reasons."
│  
│      invoke-direct {p0, v4, v5, v6}, Lorg/fdroid/fdroid/net/LocalHTTPD;->createResponse(Lfi/iki/elonen/NanoHTTPD$Response$Status;Ljava/lang/String;Ljava/lang/String;)Lfi/iki/elonen/NanoHTTPD$Response;
│  
│      move-result-object v2
│  
│ -    .line 211
│ +    .line 210
│      :goto_0
│      return-object v2
│  
│      .line 174
│      :cond_1
│      new-instance v0, Ljava/io/File;
│  
│ @@ -1671,18 +1641,16 @@
│      .local v3, "response":Lfi/iki/elonen/NanoHTTPD$Response;
│      if-eqz v3, :cond_7
│  
│      .end local v3    # "response":Lfi/iki/elonen/NanoHTTPD$Response;
│      :goto_1
│      move-object v2, v3
│  
│ -    .line 211
│      goto/16 :goto_0
│  
│ -    .line 210
│      .restart local v3    # "response":Lfi/iki/elonen/NanoHTTPD$Response;
│      :cond_7
│      sget-object v4, Lfi/iki/elonen/NanoHTTPD$Response$Status;->NOT_FOUND:Lfi/iki/elonen/NanoHTTPD$Response$Status;
│  
│      const-string v5, "text/plain"
│  
│      const-string v6, "Error 404, file not found."
├── smali/org/fdroid/fdroid/net/bluetooth/BluetoothServer$ClientConnection.smali
│ @@ -208,15 +208,15 @@
│      move-result-object v7
│  
│      .line 173
│      invoke-virtual {v7}, Lorg/fdroid/fdroid/net/bluetooth/httpish/Response$Builder;->build()Lorg/fdroid/fdroid/net/bluetooth/httpish/Response;
│  
│      move-result-object v7
│  
│ -    .line 187
│ +    .line 184
│      :goto_1
│      return-object v7
│  
│      .line 160
│      :cond_0
│      new-instance v3, Ljava/util/HashMap;
│  
│ @@ -416,15 +416,15 @@
│  
│      const-string v6, "FORBIDDEN: Won\'t serve ../ for security reasons."
│  
│      invoke-direct {p0, v4, v5, v6}, Lorg/fdroid/fdroid/net/bluetooth/BluetoothServer$ClientConnection;->createResponse(Lfi/iki/elonen/NanoHTTPD$Response$Status;Ljava/lang/String;Ljava/lang/String;)Lorg/fdroid/fdroid/net/bluetooth/httpish/Response;
│  
│      move-result-object v2
│  
│ -    .line 240
│ +    .line 239
│      :goto_0
│      return-object v2
│  
│      .line 206
│      :cond_1
│      new-instance v0, Ljava/io/File;
│  
│ @@ -630,18 +630,16 @@
│      .local v3, "response":Lorg/fdroid/fdroid/net/bluetooth/httpish/Response;
│      if-eqz v3, :cond_7
│  
│      .end local v3    # "response":Lorg/fdroid/fdroid/net/bluetooth/httpish/Response;
│      :goto_1
│      move-object v2, v3
│  
│ -    .line 240
│      goto/16 :goto_0
│  
│ -    .line 239
│      .restart local v3    # "response":Lorg/fdroid/fdroid/net/bluetooth/httpish/Response;
│      :cond_7
│      sget-object v4, Lfi/iki/elonen/NanoHTTPD$Response$Status;->NOT_FOUND:Lfi/iki/elonen/NanoHTTPD$Response$Status;
│  
│      const-string v5, "text/plain"
│  
│      const-string v6, "Error 404, file not found."
├── smali/org/fdroid/fdroid/views/ManageReposActivity$AddRepo.smali
│ @@ -604,15 +604,15 @@
│      .prologue
│      .line 581
│      if-nez p1, :cond_0
│  
│      .line 582
│      const/4 v0, 0x0
│  
│ -    .line 599
│ +    .line 598
│      :goto_0
│      return-object v0
│  
│      .line 584
│      :cond_0
│      new-instance v8, Ljava/net/URI;
├── smali/org/fdroid/fdroid/views/fragments/AppListFragment.smali
│ @@ -440,14 +440,15 @@
│  
│      const-string v6, "name"
│  
│      move-object v5, v4
│  
│      invoke-direct/range {v0 .. v6}, Landroid/support/v4/content/CursorLoader;-><init>(Landroid/content/Context;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V
│  
│ +    .line 201
│      return-object v0
│  
│      .line 200
│      .end local v2    # "uri":Landroid/net/Uri;
│      :cond_0
│      invoke-virtual {p0}, Lorg/fdroid/fdroid/views/fragments/AppListFragment;->getDataUri()Landroid/net/Uri;
├── smali/org/fdroid/fdroid/views/swap/SelectAppsView.smali
│ @@ -393,14 +393,15 @@
│  
│      const-string v6, "applicationLabel"
│  
│      move-object v5, v4
│  
│      invoke-direct/range {v0 .. v6}, Landroid/support/v4/content/CursorLoader;-><init>(Landroid/content/Context;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V
│  
│ +    .line 162
│      return-object v0
│  
│      .line 160
│      .end local v2    # "uri":Landroid/net/Uri;
│      :cond_0
│      iget-object v0, p0, Lorg/fdroid/fdroid/views/swap/SelectAppsView;->mCurrentFilterString:Ljava/lang/String;