aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java
AgeCommit message (Collapse)AuthorFilesLines
2019-05-31Convert GitOperation API and implementations to KotlinHarsh Shandilya1-66/+0
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
2019-05-15Allow the user to push local master to a new branch in case of conflict (#508)Mohamed Zenadi1-2/+2
* detect that we're in a detached head and show the message * add a new way to clean local repo in case of failed rebase
2019-01-02Bump minSdk to 21 (#466)Harsh Shandilya1-9/+1
* Bump minSdk to 21 Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * PasswordGenerator: Constify things Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Deprecate PRNG fixes The problem being fixed doesn't exist on SDK 21 and above. Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * treewide: Switch to lambdas Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * treewide: Formatting fixes Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * treewide: Remove useless casts and add missing annotations Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
2017-08-11introduce onSuccess/onErrorzeapo1-2/+2
2017-08-02Fix more lint (#325)Felix Bechstein1-5/+5
* fix/ignore lint errors, run lint on travis * fix/ignore some lint warnings
2017-06-24revert auto-sync and background git activityMohamed Zenadi1-2/+2
too buggy, no time to work on it correclty
2017-06-15fix files not being committedMohamed1-1/+1
2017-06-05add autoSync on startupzeapo1-2/+2
2017-06-05on sync add non-committed files toozeapo1-1/+1
2017-03-27fix git rm and syncMohamed Zenadi1-2/+6
fixes #276 fixes #283
2016-12-30sync command now tries to commit before pull/pushMohamed Zenadi1-9/+10
2016-12-11Handle jgit errors (#243)Mohamed Zenadi1-3/+22
* initial work on the git error handling * remove throws exception and handle the jsch one correctly * move the commit task into its own operation * get rid of the interface and rely on the abstract class GitOperation * add error message to the pull command * add error message to the push command * add error message to the sync operationˆ
2015-04-19Add a Sync command that calls Pull then PushMohamed Zenadi1-0/+50
Fixes #78