Merge branch 'fixes-for-1.0-alpha2' into 'master'

Fixes for 1.0 alpha2

Closes #1149

See merge request !573

app/build.gradle

@@ -207,6 +207,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    aaptOptions {
+        cruncherEnabled = false
+    }
+
     defaultConfig {
         versionCode 1000001
         versionName getVersionName()

app/src/main/java/org/fdroid/fdroid/CleanCacheService.java

@@ -93,7 +93,7 @@ public class CleanCacheService extends IntentService {
         }
 
         for (File f : files) {
-            if (f.getName().startsWith("install-")) {
+            if (f.getName().endsWith(".apk")) {
                 clearOldFiles(f, TimeUnit.HOURS.toMillis(1));
             }
         }

app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java

@@ -138,6 +138,10 @@ public class RepoXMLHandler extends DefaultHandler {
                     break;
                 case ApkTable.Cols.SIGNATURE:
                     curapk.sig = str;
+                    // the first APK in the list provides the preferred signature
+                    if (curapp.preferredSigner == null) {
+                        curapp.preferredSigner = str;
+                    }
                     break;
                 case ApkTable.Cols.SOURCE_NAME:
                     curapk.srcname = str;

app/src/main/java/org/fdroid/fdroid/data/App.java

@@ -15,6 +15,7 @@ import android.os.Environment;
 import android.os.LocaleList;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
@@ -101,6 +102,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     @JsonIgnore
     private AppPrefs prefs;
     @JsonIgnore
+    @NonNull
     public String preferredSigner;
 
     @JacksonInject("repoId")
@@ -159,6 +161,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
      * The index-v1 metadata uses the term `suggestedVersionCode` but we need that
      * value to end up in the `upstreamVersionCode` property here. These variables
      * need to be renamed across the whole F-Droid ecosystem to make sense.
+     *
      * @see <a href="https://gitlab.com/fdroid/fdroidclient/issues/1063">issue #1063</a>
      */
     @JsonProperty("suggestedVersionCode")
@@ -210,7 +213,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     }
 
     @Override
-    public int compareTo(App app) {
+    public int compareTo(@NonNull App app) {
         return name.compareToIgnoreCase(app.name);
     }
 
@@ -1137,17 +1140,14 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
      * However, if the app is installed, then we override this and instead want to only encourage
      * the user to try and install versions with that signature (because thats all the OS will let
      * them do).
-     * TODO: I don't think preferredSigner should ever be null, because if an app has apks then
-     * we should have chosen the first and used that. If so, then we should change to @NonNull and
-     * throw an exception if it is null.
      */
-    @Nullable
+    @NonNull
     public String getMostAppropriateSignature() {
         if (!TextUtils.isEmpty(installedSig)) {
             return installedSig;
         } else if (!TextUtils.isEmpty(preferredSigner)) {
             return preferredSigner;
         }
-        return null;
+        throw new IllegalStateException("Most Appropriate Signature not found!");
     }
 }

app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java

@@ -127,10 +127,10 @@ public final class LocalRepoManager {
         try {
             appInfo = pm.getApplicationInfo(fdroidPackageName, PackageManager.GET_META_DATA);
             SanitizedFile apkFile = SanitizedFile.knownSanitized(appInfo.publicSourceDir);
-            SanitizedFile fdroidApkLink = new SanitizedFile(webRoot, "fdroid.client.apk");
+            SanitizedFile fdroidApkLink = new SanitizedFile(fdroidDir, "F-Droid.apk");
             attemptToDelete(fdroidApkLink);
             if (Utils.symlinkOrCopyFileQuietly(apkFile, fdroidApkLink)) {
-                fdroidClientURL = "/" + fdroidApkLink.getName();
+                fdroidClientURL = "/" + fdroidDir.getName() + "/" + fdroidApkLink.getName();
             }
         } catch (PackageManager.NameNotFoundException e) {
             Log.e(TAG, "Could not set up F-Droid apk in the webroot", e);