Merge branch 'merge-requests/44'

.gitignore

@@ -1,8 +1,10 @@
 local.properties
 build.properties
 .classpath
-bin/*
-gen/*
+/bin/
+/gen/
+/build
+/.gradle
 proguard.cfg
 build.xml
 *~

AndroidManifest.xml

@@ -78,24 +78,28 @@
                 <data android:scheme="http" />
                 <data android:scheme="https" />
                 <data android:host="*" />
-                <!-- the patterns are unpredictable, this is the best I could get working -->
-                <data android:path="/repo" />
-                <data android:path="/archive" />
-                <data android:pathPattern="/repo/*" />
-                <data android:pathPattern="/archive/*" />
-                <data android:pathPattern="/.*/repo" />
-                <data android:pathPattern="/.*/archive" />
-                <data android:pathPattern="/.*/repo/*" />
-                <data android:pathPattern="/.*/archive/*" />
-                <data android:pathPattern="/.*/.*/repo" />
-                <data android:pathPattern="/.*/.*/archive" />
-                <data android:pathPattern="/.*/.*/repo/*" />
-                <data android:pathPattern="/.*/.*/archive/*" />
-                <data android:pathPattern="/.*/.*/.*/repo" />
-                <data android:pathPattern="/.*/.*/.*/archive" />
-                <data android:pathPattern="/.*/.*/.*/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/archive/*" />
-            </intent-filter>
+                <!--
+                The pattern matcher here is poorly implemented, in particular the * is
+                non-greedy, so you have to do stupid tricks to match patterns that have
+                repeat characters in them. http://stackoverflow.com/a/8599921/306864
+                -->
+                <data android:path="/fdroid/repo" />
+                <data android:pathPattern="/fdroid/repo/*" />
+                <data android:pathPattern="/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/repo/*" />
+                <data android:path="/fdroid/archive" />
+                <data android:pathPattern="/fdroid/archive/*" />
+                <data android:pathPattern="/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
+                </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

build.gradle

@@ -0,0 +1,41 @@
+buildscript {
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath 'com.android.tools.build:gradle:0.6.+'
+	}
+}
+
+apply plugin: 'android'
+
+dependencies {
+	compile files('libs/android-support-v4.jar')
+}
+
+android {
+	compileSdkVersion 19
+	buildToolsVersion "19.0.0"
+
+	sourceSets {
+		main {
+			manifest.srcFile 'AndroidManifest.xml'
+			java.srcDirs = ['src', 'extern/Universal-Image-Loader/library/src']
+			resources.srcDirs = ['src']
+			aidl.srcDirs = ['src']
+			renderscript.srcDirs = ['src']
+			res.srcDirs = ['res']
+			assets.srcDirs = ['assets']
+		}
+
+		instrumentTest.setRoot('tests')
+	}
+
+	buildTypes {
+		release {
+			runProguard true
+			proguardFile 'proguard-project.txt'
+			proguardFile getDefaultProguardFile('proguard-android.txt')
+		}
+	}
+}

extern/Universal-Image-Loader

@@ -1 +1 @@
-Subproject commit 4aec203474927e98ef6da4d0f04e6e98e6d082ab
+Subproject commit 66042fe4a38d5e96030144546290ba0404d24e28