From 335880492e0e3a2fa23f1deeee2e64ae07262ebc Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Sat, 4 Oct 2014 01:58:27 +0200
Subject: [PATCH] Tinfoil-SMS: Try to remove jars.

---
 metadata/com.tinfoil.sms.txt                  | 27 +++----
 .../com.tinfoil.sms/tinfoilsms-gradle.patch   | 74 +++++++++++++++++++
 srclibs/Orwell.txt                            |  2 +-
 3 files changed, 87 insertions(+), 16 deletions(-)
 create mode 100644 metadata/com.tinfoil.sms/tinfoilsms-gradle.patch

diff --git a/metadata/com.tinfoil.sms.txt b/metadata/com.tinfoil.sms.txt
index c3562eb359..2ccead2864 100644
--- a/metadata/com.tinfoil.sms.txt
+++ b/metadata/com.tinfoil.sms.txt
@@ -3,12 +3,15 @@ License:GPLv3
 Web Site:http://tinfoilhat.github.io/tinfoil-sms
 Source Code:https://github.com/tinfoilhat/tinfoil-sms
 Issue Tracker:https://github.com/tinfoilhat/tinfoil-sms/issues
+Donate:https://tinfoilhat.github.io/tinfoil-sms/#donate
 
 Auto Name:Tinfoil-SMS
 Summary:Encrypt text messages
 Description:
 Tinfoil-SMS encrypts your texts. It uses 256 bit ECC public keys as well
 as a unique signed key exchange to prevent any "man-in-the-middle" attacks.
+
+WARNING! THIS BUILD USES BINARY FILES FROM UPSTREAM!
 .
 
 Repo Type:git
@@ -23,25 +26,19 @@ Build:1.3.1,16
     prebuild=cp $$Orwell$$/libs/bcprov-jdk15on-150.jar $$Orwell$$/../bin/orwell-1.1.jar libs/
     scanignore=resources
 
-Build:1.4.0+-fdroid,20
-    disable=orwell and bc/sc fail to build
-    commit=v1.4.0-fdroid
-    srclibs=1:NineOldAndroids@2.4.0,2:Orwell@v1.1,BouncyCastle@r1rv50,StrippedCastle@r1rv50
+Build:1.4.0,20
+    disable=builds, but orwell and bcprob are binaries
+    commit=cfe99a6264af818521d1ed6c3f9c18b4089b5f8b
+    srclibs=1:NineOldAndroids@2.4.0,Orwell@v1.1
     rm=libs/*
     extlibs=android/android-support-v4.jar
-    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties && echo -e 'java.source=1.7\njava.target=1.7' > $$Orwell$$/ant.properties && rm $$Orwell$$/../bin/orwell-1.1.jar && rm -fR $$Orwell$$/src/com/orwell/test && rm -fR $$Orwell$$/src/org/junit && cp $$Orwell$$/libs/bcprov-jdk15on-150.jar libs/
-    scanignore=resources
+    prebuild=cp $$Orwell$$/../bin/orwell*jar $$Orwell$$/libs/bcprov*jar libs/
 
 Maintainer Notes:
-
-bcprov cannot be replaced with..
- .. bouncycastle sourcebuild
- .. bouncycastle jar release
- .. strippedcastle sourcebuild
-
-it currently works with bcprov jar provided by orwell
-
-orwell itself fails to build
+* Use commits from master-fdroid ...
+* ... or v.v.v-fdroid tags.
+* orwell and bcprov fail to build from source
+* Patch to switch to gradle is included, wait for Orwell's issue #2.
 .
 
 Auto Update Mode:None
diff --git a/metadata/com.tinfoil.sms/tinfoilsms-gradle.patch b/metadata/com.tinfoil.sms/tinfoilsms-gradle.patch
new file mode 100644
index 0000000000..5e0b33073f
--- /dev/null
+++ b/metadata/com.tinfoil.sms/tinfoilsms-gradle.patch
@@ -0,0 +1,74 @@
+diff --git a/build.gradle b/build.gradle
+index e69de29..1cef4c8 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -0,0 +1,69 @@
++buildscript {
++    repositories {
++        mavenCentral()
++    }
++
++    dependencies {
++        classpath 'com.android.tools.build:gradle:0.12.2'
++    }
++}
++
++apply plugin: 'com.android.application'
++
++android {
++    compileSdkVersion 19
++    buildToolsVersion '19.1'
++
++    defaultConfig {
++        minSdkVersion 9
++        targetSdkVersion 19
++    }
++
++    compileOptions {
++        sourceCompatibility JavaVersion.VERSION_1_7
++        targetCompatibility JavaVersion.VERSION_1_7
++    }
++
++    packagingOptions {
++        exclude 'META-INF/LICENSE.txt'
++        exclude 'META-INF/NOTICE.txt'
++    }
++    
++    sourceSets {
++        main {
++            manifest.srcFile 'AndroidManifest.xml'
++            java.srcDirs = ['src']
++            resources.srcDirs = ['src']
++            aidl.srcDirs = ['src']
++            renderscript.srcDirs = ['src']
++            res.srcDirs = ['res']
++            assets.srcDirs = ['assets']
++        }
++    }
++    
++    lintOptions {
++        abortOnError false
++    }
++
++    repositories {
++        mavenCentral()
++        mavenLocal()
++    }
++
++    dependencies {
++        compile 'com.nineoldandroids:library:2.4.0'
++        compile 'com.android.support:support-v4:19.0.+'
++        compile 'com.madgag.spongycastle:core:1.51.0.0'
++        compile 'com.madgag.spongycastle:prov:1.51.0.0'
++    }
++
++
++
++
++
++
++
++
++
++
++}
diff --git a/srclibs/Orwell.txt b/srclibs/Orwell.txt
index c2fc5b3f38..7833bebc05 100644
--- a/srclibs/Orwell.txt
+++ b/srclibs/Orwell.txt
@@ -2,4 +2,4 @@ Repo Type:git
 Repo:https://github.com/gnu-user/orwell.git
 
 Subdir:Orwell
-
+Prepare:rm -fR src/com/orwell/test src/org/junit && echo -e 'java.source=1.7\njava.target=1.7' > ant.properties