diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 288d1f47..d6ba61f8 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -4,7 +4,9 @@ package="me.sheimi.sgit" > + + - + + remotes = mRepo.getRemotes(); + if (remotes == null || remotes.isEmpty()) { + mActivity.showToastMessage(R.string.alert_please_add_a_remote); + return; + } + + String quickPushMsg = Profile.getQuickPushMsg(mActivity.getApplicationContext()); + if(quickPushMsg==null || quickPushMsg.isEmpty()) { + mActivity.showToastMessage(R.string.alert_plese_set_commit_msg_for_quick_push); + return; + } + + mActivity.closeOperationDrawer(); + + // stageAll(include new file), commit, push + AddToStageTask addTask = new AddToStageTask(mRepo, ".") { + @Override + protected void onPostExecute(Boolean isSuccess) { + super.onPostExecute(isSuccess); + //commit + CommitChangesTask commitTask = new CommitChangesTask(mRepo, + quickPushMsg, false, false, + Profile.getUsername(mActivity.getApplicationContext()), + Profile.getEmail(mActivity.getApplicationContext()), + new AsyncTaskPostCallback() { + @Override + public void onPostExecute(Boolean isSuccess) { + // mActivity.reset() is copy from existed code when new CommitChangeTask(), + // idk this line work for what, but it work bad on here, so comment. + // mActivity.reset(); + + PushTask pushTask = new PushTask(mRepo,remotes.toArray()[0].toString(), + false,false, + mActivity.new ProgressCallback(R.string.push_msg_init)); + pushTask.executeTask(); + } + }); + commitTask.executeTask(); + } + }; + + addTask.executeTask(); + } + +} diff --git a/app/src/main/java/me/sheimi/sgit/repo/tasks/repo/AddToStageTask.java b/app/src/main/java/me/sheimi/sgit/repo/tasks/repo/AddToStageTask.java index 5d1b2fc7..f90ec9c2 100644 --- a/app/src/main/java/me/sheimi/sgit/repo/tasks/repo/AddToStageTask.java +++ b/app/src/main/java/me/sheimi/sgit/repo/tasks/repo/AddToStageTask.java @@ -25,7 +25,14 @@ protected void onPostExecute(Boolean isSuccess) { public boolean addToStage() { try { - mRepo.getGit().add().addFilepattern(mFilePattern).call(); + // jGit hasn't a cmd direct add modified/new/deleted files, so if want to add + // those 3 types changed, need a combined call like below. + // check it: https://stackoverflow.com/a/59434085 + + //add modified/new files + mRepo.getGit().add().setUpdate(false).addFilepattern(mFilePattern).call(); + //add modified/deleted files + mRepo.getGit().add().setUpdate(true).addFilepattern(mFilePattern).call(); } catch (StopTaskException e) { return false; } catch (Throwable e) { diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml index 6a812397..f4a4bf65 100644 --- a/app/src/main/res/values-de/arrays.xml +++ b/app/src/main/res/values-de/arrays.xml @@ -19,6 +19,7 @@ Neuer Branch Pull Push + Quick Push(Add,Commit,Push) Alles zum Staging-Bereich hinzufügen Commit Reset (HARD) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 08e68564..b006b403 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -165,6 +165,8 @@ Feedback Feedback im GitHub Issue Tracker geben Farbschema ändern + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings Remote Repository gelöscht SSH Schlüssel verwalten Verwenden Sie gravatar Bilder diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml index 639ff02c..85f25f8c 100644 --- a/app/src/main/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -17,6 +17,7 @@ Nuevo Ramo Tirar Empujar + Quick Push(Add,Commit,Push) Anadir todo a stage Commit Reset (DURO) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8182a749..c99e6c64 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -166,6 +166,8 @@ Load avatar images from gravatar.com Security Select Colour Theme + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings Git Profile Open in other apps Add Private Key diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml index 1b0303cc..8aed142d 100644 --- a/app/src/main/res/values-fr/arrays.xml +++ b/app/src/main/res/values-fr/arrays.xml @@ -17,8 +17,9 @@ Nouveau Branche -       Tirer -       Pousser + Tirer + Pousser + Quick Push(Add,Commit,Push) Ajouter tout au stage Commit Reset (HARD) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c3ddd547..d9cead93 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -168,6 +168,8 @@ Charger des images d\'avatar de gravatar.com Securité Selectionner le thème de couleur + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings Profil Git Ouvrir dans d\'autres apps Ajouter une clé privée diff --git a/app/src/main/res/values-iw/arrays.xml b/app/src/main/res/values-iw/arrays.xml index 02860300..bd25775f 100644 --- a/app/src/main/res/values-iw/arrays.xml +++ b/app/src/main/res/values-iw/arrays.xml @@ -18,6 +18,7 @@ סניף חדש משוך דחוף + Quick Push(Add,Commit,Push) הוסף את כולם לשלב Commit Reset (HARD) diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 499abdfc..51ab00a6 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -151,6 +151,8 @@ Feedback Submit feedback by creating a new issue on GitHub Select Colour Theme + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings Remote removed Manage SSH Keys Use gravatar images diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml index f2c3ff48..a511574c 100644 --- a/app/src/main/res/values-ja/arrays.xml +++ b/app/src/main/res/values-ja/arrays.xml @@ -19,6 +19,7 @@ 新しいブランチ プル プッシュ + Quick Push(Add,Commit,Push) すべてステージに追加 コミット Reset (HARD) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 96d3ff23..e8fde321 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -163,6 +163,8 @@ フィードバック GitHub に新しいイシューを作成してフィードバックを送信します 色のテーマを選択 + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings リモートを削除しました SSH キーを管理 グラビア画像を使用する diff --git a/app/src/main/res/values-ko/arrays.xml b/app/src/main/res/values-ko/arrays.xml index ac2187ad..62465775 100644 --- a/app/src/main/res/values-ko/arrays.xml +++ b/app/src/main/res/values-ko/arrays.xml @@ -17,6 +17,7 @@ New Branch Pull Push + Quick Push(Add,Commit,Push) Add all to stage Commit Reset (HARD) diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d0728340..ab84ae03 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -153,6 +153,8 @@ Load avatar images from gravatar.com Security 테마선택 + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings Git 프로필 다른 앱에서 열기 Private Key 추가 diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml index 38a8e285..a072f9a4 100644 --- a/app/src/main/res/values-ru/arrays.xml +++ b/app/src/main/res/values-ru/arrays.xml @@ -17,6 +17,7 @@ Новая ветвь Обновить Загрузить + Quick Push(Add,Commit,Push) Добавить все Закоммитить СБРОС diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 83ff0073..409b8a9a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -168,6 +168,8 @@ Загрузка аватарок с gravatar.com Безопасность Тема + Set commit msg for quick push + Before Quick Push, You must set commit msg for it on Settings Профиль Git Открыть в другом приложении Добавить приватный ключ diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml index 79e2519d..75241a0d 100644 --- a/app/src/main/res/values-zh-rCN/arrays.xml +++ b/app/src/main/res/values-zh-rCN/arrays.xml @@ -19,9 +19,10 @@ 新的分支 拉取 推送 + 快速推送(添加,提交,推送) 暂存所有 提交 - 重置(强制) + 重置(HARD) 合并 获取 衍合 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 296ab193..78937518 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -154,9 +154,9 @@ - repos 的根存储位置 - 通用 - 选择作为根文件夹 + 仓库存储目录 + 常规 + 选择一个文件夹作为仓库存储目录 新建文件夹 Git配置 用户名 @@ -167,10 +167,12 @@ 版本 管理 SSH Keys SSH Keys - 使用重力图像 + 使用gravatar图像 从gravatar.com加载头像图片 安全 选择颜色主题 + 为快速推送设置提交信息 + 请先去设置页面为快速推送设置提交信息 Git 配置 在其他应用中打开 添加私钥 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 93ff4635..d1364f6c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -19,6 +19,7 @@ New Branch Pull Push + Quick Push(Add,Commit,Push) Add all to stage Commit Reset (HARD) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5710ca78..8720bab4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -176,6 +176,9 @@ use.gravatar Security Select Colour Theme + Set commit msg for quick push + quickpush.commitmsg + Before Quick Push, You must set commit msg for it on Settings color_theme_id Git Profile Open in other apps diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 23da5510..e9be9d96 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -26,7 +26,13 @@ > - + +