Skip to content

Commit 5d13458

Browse files
committed
Fixed: crash when deleting scheduled transactions
1 parent f22f24c commit 5d13458

5 files changed

Lines changed: 11 additions & 4 deletions

File tree

app/src/main/java/org/gnucash/android/db/TransactionsDbAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ public String getUID(long transactionId){
464464
@Override
465465
public boolean deleteRecord(long rowId){
466466
Log.d(TAG, "Delete transaction with record Id: " + rowId);
467+
//the splits db adapter handles deletion of the transaction
467468
return mSplitsDbAdapter.deleteSplitsForTransaction(rowId);
468469
}
469470

app/src/main/java/org/gnucash/android/model/Split.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public String toString() {
164164
* @return
165165
*/
166166
public String toCsv(){
167-
String splitString = mAmount.toString() + ";" + mAmount.getCurrency().getCurrencyCode() + ";"
167+
String splitString = mAmount.asString() + ";" + mAmount.getCurrency().getCurrencyCode() + ";"
168168
+ mAccountUID + ";" + mSplitType.name();
169169
if (mMemo != null){
170170
splitString = splitString + ";" + mMemo;

app/src/main/java/org/gnucash/android/model/Transaction.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,15 @@ public Transaction(Transaction transaction, boolean generateNewUID){
139139
initDefaults();
140140
setDescription(transaction.getDescription());
141141
setNote(transaction.getNote());
142+
setTime(transaction.getTimeMillis());
143+
mCurrencyCode = transaction.mCurrencyCode;
144+
mRecurrencePeriod = transaction.mRecurrencePeriod;
145+
//exported flag is left at default value of false
146+
142147
for (Split split : transaction.mSplitList) {
143148
addSplit(new Split(split, true));
144149
}
145-
setTime(transaction.getTimeMillis());
150+
146151
if (!generateNewUID){
147152
setUID(transaction.getUID());
148153
}

app/src/main/java/org/gnucash/android/ui/transaction/ScheduledTransactionsListFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,10 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
112112
Toast.makeText(getActivity(), R.string.toast_recurring_transaction_deleted, Toast.LENGTH_SHORT).show();
113113
}
114114
}
115-
refreshList();
116115
mode.finish();
117116
WidgetConfigurationActivity.updateAllWidgets(getActivity());
117+
getLoaderManager().destroyLoader(0);
118+
refreshList();
118119
return true;
119120

120121
default:

app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ public AmountTextWatcher(EditText amountInput) {
861861
@Override
862862
public void afterTextChanged(Editable s) {
863863
String value = s.toString();
864-
if (mTransactionTypeButton.isChecked()){
864+
if (value.length() > 0 && mTransactionTypeButton.isChecked()){
865865
if (s.charAt(0) != '-'){
866866
s = Editable.Factory.getInstance().newEditable("-" + value);
867867
}

0 commit comments

Comments
 (0)