cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ditch-appmsg

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
This commit is contained in:
Vincent Breitmoser
2014-07-26 23:06:32 +02:00
parent d8f2782293 45722d7cfb
commit 8132b9ac74
174 changed files with 5350 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@@ -40,6 +40,11 @@ Select everything for the newest SDK Platform (API-Level 19)
5. Execute ``./gradlew build``
6. You can install the app with ``adb install -r OpenKeychain/build/outputs/apk/OpenKeychain-debug-unaligned.apk``
### Run Tests
1. Use OpenJDK instead of Oracle JDK
2. Execute ``./prepare-tests.sh``
3. Execute ``./gradlew build``
### Build API Demo with Gradle
1. Follow 1-4 from above
@@ -48,13 +53,10 @@ Select everything for the newest SDK Platform (API-Level 19)
### Development with Android Studio
I am using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because I am using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html).
We are using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because we are using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html).
1. Clone the project from github
2. From Android Studio: File -> Import Project -> ...
* Select the cloned top folder if you want to develop on the main project
* Select the "OpenKeychain-API" folder if you want to develop on the API example
3. Import project from external model -> choose Gradle
1. Clone the project from Github
2. From Android Studio: File -> Import Project -> Select the cloned top folder
## OpenKeychain's API