From 78caf6309342ce6b20ecb3ffc39d1c8bf4544023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 27 Nov 2013 15:23:55 +0100 Subject: [PATCH 1/3] Update UIL to latest master --- extern/Universal-Image-Loader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/Universal-Image-Loader b/extern/Universal-Image-Loader index 4aec20347..66042fe4a 160000 --- a/extern/Universal-Image-Loader +++ b/extern/Universal-Image-Loader @@ -1 +1 @@ -Subproject commit 4aec203474927e98ef6da4d0f04e6e98e6d082ab +Subproject commit 66042fe4a38d5e96030144546290ba0404d24e28 From 7dfe9eac24bd8cdce8aedd6fe8e25849b3b936a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 27 Nov 2013 15:47:13 +0100 Subject: [PATCH 2/3] Add basic gradle support --- .gitignore | 6 ++++-- build.gradle | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 build.gradle diff --git a/.gitignore b/.gitignore index 36c1ea6f6..ac460002d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ local.properties build.properties .classpath -bin/* -gen/* +/bin/ +/gen/ +/build +/.gradle proguard.cfg build.xml *~ diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..3cb2a0234 --- /dev/null +++ b/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') + } + } +} From a3ac298ae4d84cb008bf8111b3f965cb69c4ca9f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 2 Dec 2013 15:37:49 -0500 Subject: [PATCH 3/3] narrowly tailor repo URL matching to avoid false matches With so many patterns being matched, it is highly likely that there will be false positives, i.e. random URLs will trigger the prompt of whether to use F-Droid or not. The updated set of patterns narrowly tailors the matches so that it is highly unlikely to match URLs that are not fdroid repos, yet still makes it useful both as a generic repo and a peer-to-peer bootstrapping repo. This set of patterns only matches URLs like this: https://foo.org/fdroid/repo https://foo.org/fdroid/repo/ https://foo.org/fdroid/repo///// It does not match URLs like this: https://f-droid.org/repo https://myblog.com/thoughts-about-my-lovely-fdroid-repo https://news.com/tag/repo https://somesite.com/repo/this-is-my-stuff It matches multiple slashes to since those are in effect the same URL, and they sometimes show up as typos. This does not include mvdan's proposal for the 'fdroid-bootstrap' tag on the end because its not something that I would use in this current project, so I don't know how best to apply it. I have no objection to the 'fdroid-bootstrap' proposal. --- AndroidManifest.xml | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b23692682..e9e3f1a3a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -78,24 +78,28 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +