merge master changes
This commit is contained in:
commit
908d2690b4
8 changed files with 18 additions and 14 deletions
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "openpgp-api-lib"]
|
||||||
|
path = libraries/openpgp-api-lib
|
||||||
|
url = https://github.com/open-keychain/openpgp-api-lib.git
|
|
@ -15,7 +15,6 @@
|
||||||
</option>
|
</option>
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
<option name="offlineWork" value="true" />
|
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.googlecode.javaewah/JavaEWAH/0.7.9/eceaf316a8faf0e794296ebe158ae110c7d72a5a/JavaEWAH-0.7.9.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.googlecode.javaewah/JavaEWAH/0.7.9/eceaf316a8faf0e794296ebe158ae110c7d72a5a/JavaEWAH-0.7.9.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES />
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.googlecode.javaewah/JavaEWAH/0.7.9/a50d78eb630e05439461f3130b94b3bcd1ea6f03/JavaEWAH-0.7.9-sources.jar!/" />
|
|
||||||
</SOURCES>
|
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -4,8 +4,6 @@
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-io/1.3.2/b6dde38349ba9bb5e6ea6320531eae969985dae5/commons-io-1.3.2.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-io/1.3.2/b6dde38349ba9bb5e6ea6320531eae969985dae5/commons-io-1.3.2.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES />
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-io/1.3.2/b41a5f39fa90007a6c247175933555ba5f166d70/commons-io-1.3.2-sources.jar!/" />
|
|
||||||
</SOURCES>
|
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -4,8 +4,6 @@
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jcraft/jsch/0.1.50/fae4a0b1f2a96cb8f58f38da2650814c991cea01/jsch-0.1.50.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jcraft/jsch/0.1.50/fae4a0b1f2a96cb8f58f38da2650814c991cea01/jsch-0.1.50.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES />
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jcraft/jsch/0.1.50/b6eca0935acca8dcd773df56f0fccec5d9877252/jsch-0.1.50-sources.jar!/" />
|
|
||||||
</SOURCES>
|
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -4,8 +4,6 @@
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/3.4.1.201406201815-r/7fe73a21f4a078abaaface4d2b03b5eb3d306f63/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/3.4.1.201406201815-r/7fe73a21f4a078abaaface4d2b03b5eb3d306f63/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES />
|
||||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/3.4.1.201406201815-r/acdc9ac7c94efa1eeedca6e9243ddea08a9adad3/org.eclipse.jgit-3.4.1.201406201815-r-sources.jar!/" />
|
|
||||||
</SOURCES>
|
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -6,6 +6,7 @@
|
||||||
<module fileurl="file://$PROJECT_DIR$/PwdStore.iml" filepath="$PROJECT_DIR$/PwdStore.iml" />
|
<module fileurl="file://$PROJECT_DIR$/PwdStore.iml" filepath="$PROJECT_DIR$/PwdStore.iml" />
|
||||||
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
|
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
|
||||||
<module fileurl="file://$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" filepath="$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" />
|
<module fileurl="file://$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" filepath="$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" />
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" filepath="$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
11
README.md
11
README.md
|
@ -3,6 +3,9 @@ PwdStore
|
||||||
|
|
||||||
This application tries to be 100% compatible with [pass](http://www.zx2c4.com/projects/password-store/)
|
This application tries to be 100% compatible with [pass](http://www.zx2c4.com/projects/password-store/)
|
||||||
|
|
||||||
|
You can install the application either from the [Play Store](https://play.google.com/store/apps/details?id=com.zeapo.pwdstore),
|
||||||
|
using the apk file found at `app/app-release.apk` or build everything from source.
|
||||||
|
|
||||||
Features
|
Features
|
||||||
========
|
========
|
||||||
- Clone an existing pass repository
|
- Clone an existing pass repository
|
||||||
|
@ -17,7 +20,13 @@ Libraries
|
||||||
=========
|
=========
|
||||||
This project uses three libraries:
|
This project uses three libraries:
|
||||||
|
|
||||||
- [OpenKeyChain](https://github.com/open-keychain/open-keychain) for encryption and decryption of passwords
|
- [OpenKeyChain](https://github.com/open-keychain/open-keychain) for encryption and decryption of passwords.
|
||||||
|
To download the library, run the following commands at the root of the project
|
||||||
|
|
||||||
|
git submodule init
|
||||||
|
git submodule update
|
||||||
|
|
||||||
|
|
||||||
- [JGit](http://www.eclipse.org/jgit/) a pretty good git lib
|
- [JGit](http://www.eclipse.org/jgit/) a pretty good git lib
|
||||||
- [Apache's FileUtils](https://commons.apache.org/proper/commons-io/) for files manipulations
|
- [Apache's FileUtils](https://commons.apache.org/proper/commons-io/) for files manipulations
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue