Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #1518 and #1519 #1520

Merged
merged 2 commits into from
Jan 14, 2024
Merged

Issue #1518 and #1519 #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8efeedf
Issue #1518 restore export in QIF
wolfsolver Jan 13, 2024
ce39689
Issue #1519 Restore Notification
wolfsolver Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/money/manager/ex/database/QueryAllData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class QueryAllData
// public static final String FromAccountId = "FromAccountId";
// public static final String FromAmount = "FromAmount";
// public static final String FromCurrencyId = "FromCurrencyId";
public static final String SPLITTED = "Splitted";
public static final String SPLITTED = "SPLITTED";
public static final String ParentCategID = "ParentCategID";
public static final String CategID = "CategID";
public static final String SubcategID = "SubcategID";
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/money/manager/ex/notifications/RecurringTransactionNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.money.manager.ex.notifications;

import android.annotation.SuppressLint;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
Expand Down Expand Up @@ -89,7 +90,7 @@ private void showNotification(SyncNotificationModel model) {
// set launch from notification // check pin code
intent.putExtra(RecurringTransactionListActivity.INTENT_EXTRA_LAUNCH_NOTIFICATION, true);

PendingIntent pendingIntent = PendingIntent.getActivity(getContext(), 0, intent, 0);
PendingIntent pendingIntent = PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_IMMUTABLE);

// todo: Actions
// Intent skipIntent = new Intent(intent);
Expand Down Expand Up @@ -126,6 +127,7 @@ private void showNotification(SyncNotificationModel model) {
}
}

@SuppressLint("Range")
private SyncNotificationModel getNotificationContent(Cursor cursor) {
SyncNotificationModel result = new SyncNotificationModel();

Expand All @@ -134,7 +136,7 @@ private SyncNotificationModel getNotificationContent(Cursor cursor) {
CurrencyService currencyService = new CurrencyService(mContext);

while (cursor.moveToNext()) {
String payeeName = cursor.getString(cursor.getColumnIndex(QueryBillDeposits.PAYEENAME));
@SuppressLint("Range") String payeeName = cursor.getString(cursor.getColumnIndex(QueryBillDeposits.PAYEENAME));
// check if payee name is null, then put toAccountName
if (TextUtils.isEmpty(payeeName))
payeeName = cursor.getString(cursor.getColumnIndex(QueryBillDeposits.TOACCOUNTNAME));
Expand Down
Loading