Open
Conversation
Contributor
dara-abijo-adfa
commented
Mar 13, 2026
dara-abijo-adfa
commented
- Stage and commit selected files
- View commit history
Allow users set their git identity (username and password) for use in commits
dara-abijo-adfa
requested review from
Daniel-ADFA,
itsaky-adfa,
jatezzz and
jomen-adfa
and removed request for
Daniel-ADFA and
itsaky-adfa
Contributor
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughAdds commit creation UI and flow, commit history dialog and adapter, Git user preferences, repository staging/commit APIs and JGit implementation, plus related layouts, strings, and styles. ViewModel exposes commitHistory and commitChanges to coordinate UI, preferences, and repository operations. Changes
Sequence Diagram(s)sequenceDiagram
participant User
participant Fragment as GitBottomSheetFragment
participant Prefs as GitPreferences
participant ViewModel
participant Repo as GitRepository
User->>Fragment: Click Commit
Fragment->>Prefs: hasAuthorInfo()?
alt author missing
Fragment->>Fragment: showAuthorPopup()
Fragment-->>User: show warning / link to Preferences
else author present
Fragment->>Fragment: gather summary, desc, selectedPaths
Fragment->>ViewModel: commitChanges(summary, desc, paths)
ViewModel->>Repo: stageFiles(paths)
Repo-->>ViewModel: staged
ViewModel->>Repo: commit(message, authorName, authorEmail)
Repo-->>ViewModel: GitCommit?
ViewModel-->>Fragment: update status / commitHistory
Fragment->>Fragment: clear inputs / selections
Fragment-->>User: commit complete
end
sequenceDiagram
participant User
participant Fragment as GitBottomSheetFragment
participant Dialog as GitCommitHistoryDialog
participant ViewModel
participant Repo as GitRepository
participant Adapter as GitCommitHistoryAdapter
User->>Fragment: Click View History
Fragment->>Dialog: show()
Dialog->>ViewModel: getCommitHistoryList()
ViewModel->>Repo: getHistory()
Repo-->>ViewModel: List<GitCommit>
ViewModel-->>Dialog: commitHistory StateFlow emits
Dialog->>Adapter: submitList(commits)
Adapter->>Adapter: DiffCallback updates RecyclerView
Dialog-->>User: display history
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
📝 Coding Plan
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🧹 Nitpick comments (2)
app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt (1)
104-106: Consider narrowing exception handling as specific exceptions are identified.The broad
catch (e: Exception)works for initial implementation, but per project guidelines, prefer narrowing to specific exception types as they're identified through crash reports. This aligns with fail-fast behavior during development.Additionally, the commit operation silently fails without notifying the UI. Consider exposing a result state or callback so users know whether the commit succeeded or failed.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt` around lines 104 - 106, The catch-all in GitBottomSheetViewModel around the commit operation should be narrowed to concrete exception types (e.g., IOException, org.eclipse.jgit.api.errors.GitAPIException or whatever your Git library throws) instead of catch (e: Exception); replace the broad catch in the commit method with specific catches and preserve logging (log.error(..., e)) for each type. Also surface the operation outcome to the UI by adding a state or callback on the ViewModel (for example a LiveData/StateFlow named commitResult or a sealed Result type) and set success/failure there inside the try/catch so callers can react instead of failing silently; update any call sites to observe/handle commitResult accordingly.app/src/main/res/layout/fragment_git_bottom_sheet.xml (1)
6-6: Remove obsoleteandroid:orientationattribute.The
android:orientation="vertical"attribute has no effect onConstraintLayout(it's only applicable toLinearLayout). This appears to be a leftover from when the layout was aLinearLayout.🧹 Proposed fix
android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:padding="16dp">🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/res/layout/fragment_git_bottom_sheet.xml` at line 6, Remove the obsolete android:orientation="vertical" attribute from the ConstraintLayout in fragment_git_bottom_sheet.xml: locate the root ConstraintLayout element (or any ConstraintLayout in that file) and delete the android:orientation attribute since it only applies to LinearLayout and has no effect here; confirm no other layout behavior depends on that attribute and run a quick lint/compile to ensure no side effects.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt`:
- Around line 103-118: The current click handler clears commitSummary,
commitDescription, and fileChangeAdapter.selectedFiles immediately after calling
viewModel.commitChanges; change this so inputs and selections are only cleared
after the commit actually succeeds and the status refresh completes by observing
the commit result or the viewModel.gitStatus StateFlow/LiveData. Update the
commit flow in GitBottomSheetFragment: call viewModel.commitChanges(summary,
description, selectedPaths) but remove immediate clearing; instead
collect/observe viewModel.commit result or viewModel.gitStatus and on a
successful state (or a commit-success event) clear binding.commitSummary.text,
binding.commitDescription.text, and fileChangeAdapter.selectedFiles and then
notify the adapter to rebind so UI checkboxes match the cleared selection.
Ensure failure cases do not clear inputs so the user can retry.
In
`@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt`:
- Around line 111-116: getCommitHistoryList currently launches a coroutine that
calls currentRepository?.getHistory() without error handling; wrap the
repository call in a try-catch (mirroring refreshStatus()) so any exceptions
from getHistory() are caught, log or surface the error appropriately (e.g., via
processLogger or an existing error LiveData) and ensure _commitHistory.value is
set to history on success or to emptyList() on failure to avoid crashing the
coroutine and leaving the UI without feedback; update the implementation in
getCommitHistoryList and reference currentRepository?.getHistory(),
_commitHistory, and refreshStatus() as the pattern to follow.
---
Nitpick comments:
In
`@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt`:
- Around line 104-106: The catch-all in GitBottomSheetViewModel around the
commit operation should be narrowed to concrete exception types (e.g.,
IOException, org.eclipse.jgit.api.errors.GitAPIException or whatever your Git
library throws) instead of catch (e: Exception); replace the broad catch in the
commit method with specific catches and preserve logging (log.error(..., e)) for
each type. Also surface the operation outcome to the UI by adding a state or
callback on the ViewModel (for example a LiveData/StateFlow named commitResult
or a sealed Result type) and set success/failure there inside the try/catch so
callers can react instead of failing silently; update any call sites to
observe/handle commitResult accordingly.
In `@app/src/main/res/layout/fragment_git_bottom_sheet.xml`:
- Line 6: Remove the obsolete android:orientation="vertical" attribute from the
ConstraintLayout in fragment_git_bottom_sheet.xml: locate the root
ConstraintLayout element (or any ConstraintLayout in that file) and delete the
android:orientation attribute since it only applies to LinearLayout and has no
effect here; confirm no other layout behavior depends on that attribute and run
a quick lint/compile to ensure no side effects.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: d3cacf5b-d0f2-407f-8802-5291a5b4f7f6
📒 Files selected for processing (17)
app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.ktapp/src/main/java/com/itsaky/androidide/fragments/git/GitCommitHistoryDialog.ktapp/src/main/java/com/itsaky/androidide/fragments/git/adapter/GitCommitHistoryAdapter.ktapp/src/main/java/com/itsaky/androidide/fragments/git/adapter/GitFileChangeAdapter.ktapp/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.ktapp/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.ktapp/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.ktapp/src/main/res/layout/dialog_git_commit_history.xmlapp/src/main/res/layout/fragment_git_bottom_sheet.xmlapp/src/main/res/layout/item_git_commit.xmlapp/src/main/res/values/strings.xmlgit-core/src/main/java/com/itsaky/androidide/git/core/GitRepository.ktgit-core/src/main/java/com/itsaky/androidide/git/core/JGitRepository.ktgit-core/src/main/java/com/itsaky/androidide/git/core/models/GitCommit.ktpreferences/src/main/java/com/itsaky/androidide/preferences/internal/GitPreferences.ktresources/src/main/res/values/strings.xmlresources/src/main/res/values/styles.xml
app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt
Show resolved
Hide resolved
app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
app/src/main/res/layout/item_git_commit.xml (1)
17-50: Cap text lines to prevent oversized history rows.On Line 17, Line 28, and Line 40, these fields can grow unbounded with long commit metadata. Consider adding
maxLines+ellipsizeso one long commit doesn’t dominate the list.Suggested diff
<TextView android:id="@+id/tv_commit_message" android:layout_width="0dp" android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="2" android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@id/barrier" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="This is a commit message" /> <TextView android:id="@+id/tv_commit_author" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:ellipsize="end" + android:maxLines="1" android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textColor="?android:textColorSecondary" app:layout_constraintEnd_toStartOf="@id/barrier" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_commit_message" tools:text="Author Name" /> <TextView android:id="@+id/tv_commit_time" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:ellipsize="end" + android:maxLines="1" android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textColor="?android:textColorSecondary" app:layout_constraintEnd_toStartOf="@id/barrier" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_commit_author" tools:text="12 Mar 2026, 22:53" />🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/res/layout/item_git_commit.xml` around lines 17 - 50, The three TextViews (tv_commit_message, tv_commit_author, tv_commit_time) can grow unbounded; update each element to limit displayed lines by adding maxLines (e.g., maxLines="1" or "2" for message and 1 for author/time) and set android:ellipsize="end" so long commit messages/metadata are truncated with an ellipsis instead of expanding the row.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@app/src/main/res/layout/item_git_commit.xml`:
- Around line 17-50: The three TextViews (tv_commit_message, tv_commit_author,
tv_commit_time) can grow unbounded; update each element to limit displayed lines
by adding maxLines (e.g., maxLines="1" or "2" for message and 1 for author/time)
and set android:ellipsize="end" so long commit messages/metadata are truncated
with an ellipsis instead of expanding the row.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: e97e993e-4f9e-41ef-b1e5-9ab242793df3
📒 Files selected for processing (1)
app/src/main/res/layout/item_git_commit.xml
jatezzz
approved these changes
Mar 17, 2026
app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
♻️ Duplicate comments (1)
app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt (1)
106-122:⚠️ Potential issue | 🟡 MinorCheckbox UI not refreshed after clearing selections.
After a successful commit,
fileChangeAdapter.selectedFiles.clear()clears the internal set, but the adapter's checkbox views are not notified to update. The checkboxes will remain visually checked until the status refresh triggerssubmitList()with a new list.🛠️ Suggested fix
) { // Clear the inputs on successful commit binding.commitSummary.text?.clear() binding.commitDescription.text?.clear() fileChangeAdapter.selectedFiles.clear() + fileChangeAdapter.notifyDataSetChanged() }Alternatively, consider adding a
clearSelections()helper method in the adapter that clears the set and notifies the adapter.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt` around lines 106 - 122, The commit button handler clears the adapter's selectedFiles set but does not notify the RecyclerView to update checkbox views, so the UI stays checked; update the code to call an adapter method that both clears the selection set and refreshes views (e.g., add and call fileChangeAdapter.clearSelections() or clearSelectionsNotify() after fileChangeAdapter.selectedFiles.clear()), or implement clearSelections() inside the adapter to clear its internal selection state and call notifyDataSetChanged()/notifyItemRangeChanged() so checkboxes visually uncheck after a successful commit (refer to binding.commitButton click listener and fileChangeAdapter).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt`:
- Around line 52-70: The adapter's internal selection
(fileChangeAdapter.selectedFiles) can contain paths not present after calling
fileChangeAdapter.submitList(allChanges), causing stale selections; inside the
viewModel.gitStatus.collectLatest block, before calling submitList(allChanges)
update the selection set to match the new list by either clearing selections or
filtering fileChangeAdapter.selectedFiles to the intersection of the new
allChanges paths (derive paths from
status.staged/unstaged/untracked/conflicted), then call submitList(allChanges)
and update commit-button state accordingly; locate this logic around the
collectLatest lambda that currently computes allChanges and calls
fileChangeAdapter.submitList.
In
`@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt`:
- Around line 82-112: The commitChanges function currently swallows failures
(only log.error) and doesn't inform callers or undo partial work; change its
signature to accept an onError callback (e.g., onError: (Throwable) -> Unit)
alongside onSuccess, and update callers; inside commitChanges, detect and
preserve filesToStage, and if commit(...) throws, call onError(e) and attempt to
revert the partial staging by calling
currentRepository?.unstageFiles(filesToStage) (or an appropriate unstaging
method) before returning; ensure the catch block calls onError(e) after
unstage/cleanup and still logs the error, and keep refreshStatus()/onSuccess()
only on the successful path.
---
Duplicate comments:
In
`@app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt`:
- Around line 106-122: The commit button handler clears the adapter's
selectedFiles set but does not notify the RecyclerView to update checkbox views,
so the UI stays checked; update the code to call an adapter method that both
clears the selection set and refreshes views (e.g., add and call
fileChangeAdapter.clearSelections() or clearSelectionsNotify() after
fileChangeAdapter.selectedFiles.clear()), or implement clearSelections() inside
the adapter to clear its internal selection state and call
notifyDataSetChanged()/notifyItemRangeChanged() so checkboxes visually uncheck
after a successful commit (refer to binding.commitButton click listener and
fileChangeAdapter).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 61dbd0a9-4519-4960-961e-5ffbdd65ec14
📒 Files selected for processing (6)
app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.ktapp/src/main/java/com/itsaky/androidide/fragments/git/GitCommitHistoryDialog.ktapp/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.ktapp/src/main/res/layout/dialog_git_commit_history.xmlgit-core/src/main/java/com/itsaky/androidide/git/core/models/CommitHistoryUiState.ktresources/src/main/res/values/strings.xml
🚧 Files skipped from review as they are similar to previous changes (3)
- app/src/main/res/layout/dialog_git_commit_history.xml
- resources/src/main/res/values/strings.xml
- app/src/main/java/com/itsaky/androidide/fragments/git/GitCommitHistoryDialog.kt
app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (2)
app/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.kt (2)
60-67: Normalize blank input before persisting Git identity values.Line 60 and Line 96 currently persist empty strings. The UI treats blank as “unset” (fallback summary), so storing
nullfor blank keeps behavior consistent and avoids downstream ambiguity.Proposed fix
@@ override fun onPreferenceChanged(preference: Preference, newValue: Any?): Boolean { - val name = newValue as? String - GitPreferences.userName = name - if (!name.isNullOrBlank()) { - preference.summary = name + val name = (newValue as? String)?.trim()?.takeIf { it.isNotEmpty() } + GitPreferences.userName = name + if (name != null) { + preference.summary = name } else { preference.summary = preference.context.getString(R.string.idepref_git_user_name_summary) } return true } @@ override fun onPreferenceChanged(preference: Preference, newValue: Any?): Boolean { - val email = newValue as? String - GitPreferences.userEmail = email - if (!email.isNullOrBlank()) { - preference.summary = email + val email = (newValue as? String)?.trim()?.takeIf { it.isNotEmpty() } + GitPreferences.userEmail = email + if (email != null) { + preference.summary = email } else { preference.summary = preference.context.getString(R.string.idepref_git_user_email_summary) } return true }Also applies to: 96-103
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.kt` around lines 60 - 67, The preference handler should normalize blank strings to null before saving so blank input is treated as “unset”: in onPreferenceChanged cast newValue to String? then set GitPreferences.userName = name?.takeIf { it.isNotBlank() } and update preference.summary to either the name when not blank or the fallback string via preference.context.getString(...); apply the same change for the email handling block (GitPreferences.userEmail / its preference.summary) so empty input is persisted as null rather than an empty string.
44-53: Consider extracting shared Git identity preference behavior.
GitUserNameandGitUserEmailduplicate create-view, input-prefill, and summary fallback logic. A small shared base/helper would reduce repetition and drift risk.Also applies to: 55-58, 80-89, 91-94
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.kt` around lines 44 - 53, The GitUserName and GitUserEmail preference classes duplicate the same create-view, input prefill, and summary-fallback logic (see onCreateView using GitPreferences.userName and pref.summary with context.getString(...)). Extract that shared behavior into a small helper or base class (e.g., GitIdentityPreferenceBase or updateGitPrefView(pref, value, fallbackRes) helper) that: reads the appropriate GitPreferences field, sets the Preference summary to the value or the provided fallback string resource, and exposes a single place to prefill the input dialog. Replace the duplicated code in GitUserName and GitUserEmail to call the new base/helper from their onCreateView (and any dialog/input-prefill handlers) so both preferences reuse the logic.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@app/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.kt`:
- Around line 60-67: The preference handler should normalize blank strings to
null before saving so blank input is treated as “unset”: in onPreferenceChanged
cast newValue to String? then set GitPreferences.userName = name?.takeIf {
it.isNotBlank() } and update preference.summary to either the name when not
blank or the fallback string via preference.context.getString(...); apply the
same change for the email handling block (GitPreferences.userEmail / its
preference.summary) so empty input is persisted as null rather than an empty
string.
- Around line 44-53: The GitUserName and GitUserEmail preference classes
duplicate the same create-view, input prefill, and summary-fallback logic (see
onCreateView using GitPreferences.userName and pref.summary with
context.getString(...)). Extract that shared behavior into a small helper or
base class (e.g., GitIdentityPreferenceBase or updateGitPrefView(pref, value,
fallbackRes) helper) that: reads the appropriate GitPreferences field, sets the
Preference summary to the value or the provided fallback string resource, and
exposes a single place to prefill the input dialog. Replace the duplicated code
in GitUserName and GitUserEmail to call the new base/helper from their
onCreateView (and any dialog/input-prefill handlers) so both preferences reuse
the logic.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 816d12b3-b07f-4bb3-94b8-dab44d332d31
📒 Files selected for processing (1)
app/src/main/java/com/itsaky/androidide/preferences/gitPrefExts.kt
jatezzz
requested changes
Mar 18, 2026
app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt
Show resolved
Hide resolved
app/src/main/java/com/itsaky/androidide/fragments/git/GitCommitHistoryDialog.kt
Outdated
Show resolved
Hide resolved
jatezzz
approved these changes
Mar 19, 2026
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt (1)
82-111:⚠️ Potential issue | 🟠 MajorCommit failures can leave files staged and provide no caller-visible error path.
If
repository.stageFiles(filesToStage)succeeds butrepository.commit(...)fails, the staged state is left behind and the caller gets no failure callback (the catch only logs). Please add an error callback and rollback staged files in the failure path.🛠️ Suggested fix
fun commitChanges( summary: String, description: String? = null, selectedPaths: List<String>, - onSuccess: () -> Unit + onSuccess: () -> Unit, + onError: (String) -> Unit = {} ) { viewModelScope.launch { - try { - if (selectedPaths.isEmpty()) return@launch - - val repository = currentRepository ?: return@launch + if (selectedPaths.isEmpty()) { + onError("No files selected") + return@launch + } + val repository = currentRepository ?: run { + onError("Repository unavailable") + return@launch + } - val projectDir = File(IProjectManager.getInstance().projectDirPath) - val filesToStage = selectedPaths.map { File(projectDir, it) } + val projectDir = File(IProjectManager.getInstance().projectDirPath) + val filesToStage = selectedPaths.map { File(projectDir, it) } + try { repository.stageFiles(filesToStage) val message = if (!description.isNullOrBlank()) "$summary\n\n$description" else summary repository.commit( @@ refreshStatus() onSuccess() } catch (e: Exception) { + runCatching { repository.unstageFiles(filesToStage) } + .onFailure { rollbackError -> + log.warn("Failed to rollback staged files", rollbackError) + } log.error("Failed to commit changes", e) + onError(e.message ?: "Failed to commit changes") } - } }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt` around lines 82 - 111, The commitChanges function currently stages files via repository.stageFiles(filesToStage) and then commits with repository.commit(...), but on commit failure it only logs the exception and leaves files staged and the caller uninformed; update commitChanges to accept an onError: (Throwable) -> Unit (or reuse an existing error callback), and in the catch block call onError(e) and attempt to rollback the staged state by calling repository.unstageFiles(filesToStage) (or repository.resetFiles/appropriate unstaging method) before logging; ensure existing happy-path still calls onSuccess() and call refreshStatus() after rollback to update state.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt`:
- Around line 120-123: currentRepository being null is currently treated as
empty history; before calling currentRepository.getHistory() check for null and
handle it as an error (or trigger repository reinitialization) instead of
mapping to CommitHistoryUiState.Empty. Specifically, in the code using
currentRepository and getHistory() update the branch that sets
_commitHistory.value: if currentRepository == null set _commitHistory.value =
CommitHistoryUiState.Error (or call the repo init routine) rather than calling
getHistory() and falling through to CommitHistoryUiState.Empty; ensure you still
set CommitHistoryUiState.Empty only when getHistory() returns an empty list.
---
Duplicate comments:
In
`@app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt`:
- Around line 82-111: The commitChanges function currently stages files via
repository.stageFiles(filesToStage) and then commits with
repository.commit(...), but on commit failure it only logs the exception and
leaves files staged and the caller uninformed; update commitChanges to accept an
onError: (Throwable) -> Unit (or reuse an existing error callback), and in the
catch block call onError(e) and attempt to rollback the staged state by calling
repository.unstageFiles(filesToStage) (or repository.resetFiles/appropriate
unstaging method) before logging; ensure existing happy-path still calls
onSuccess() and call refreshStatus() after rollback to update state.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 020282a3-abaa-426c-b065-314ea3d1b406
📒 Files selected for processing (3)
app/src/main/java/com/itsaky/androidide/fragments/git/GitCommitHistoryDialog.ktapp/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.ktresources/src/main/res/values/strings.xml
✅ Files skipped from review due to trivial changes (1)
- resources/src/main/res/values/strings.xml
app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.