v2.6.2

YoshiOne · Aug 23, 2018 · 4e61fce · 4e61fce
1 parent 16b3117
commit 4e61fce
Show file tree

Hide file tree

Showing 17 changed files with 320 additions and 301 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "com.yoshione.fingen"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 125
-        versionName "2.6"
+        versionCode 127
+        versionName "2.6.2"
         resValue "string", "app_name", "Fingen"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/yoshione/fingen/ActivityMain.java b/app/src/main/java/com/yoshione/fingen/ActivityMain.java
@@ -55,7 +55,6 @@
 import com.mikepenz.materialdrawer.model.DividerDrawerItem;
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
-import com.yoshione.fingen.adapter.AdapterTransactions;
 import com.yoshione.fingen.adapter.TransactionsArrayAdapter;
 import com.yoshione.fingen.dao.SendersDAO;
 import com.yoshione.fingen.dao.SmsDAO;
@@ -66,6 +65,7 @@
 import com.yoshione.fingen.fts.ActivityScanQR;
 import com.yoshione.fingen.iab.BillingService;
 import com.yoshione.fingen.interfaces.IAbstractModel;
+import com.yoshione.fingen.interfaces.ITransactionItemEventListener;
 import com.yoshione.fingen.managers.AccountsSetManager;
 import com.yoshione.fingen.managers.TransactionManager;
 import com.yoshione.fingen.model.AccountsSet;
@@ -900,7 +900,7 @@ protected void onActivityResult(final int requestCode, final int resultCode, fin
 
                 final Dialog[] dialog = new Dialog[]{null};
                 final TransactionsArrayAdapter arrayAdapter = new TransactionsArrayAdapter(
-                        this, transactions, new AdapterTransactions.OnTransactionItemEventListener() {
+                        this, transactions, new ITransactionItemEventListener() {
                     @Override
                     public void onTransactionItemClick(Transaction foundTransaction) {
                         dialog[0].dismiss();

diff --git a/app/src/main/java/com/yoshione/fingen/ActivityPro.java b/app/src/main/java/com/yoshione/fingen/ActivityPro.java
@@ -80,11 +80,11 @@ private void updateRW() {
                                     if (!skuDetailsWrapper.isPurchased()) {
                                         mBillingService.getBillingProcessor().purchase(ActivityPro.this, skuDetailsWrapper.getSkuDetails().productId);
                                     } else {
-                                        unsubscribeOnDestroy(
-                                                mBillingService.consumePurchase(skuDetailsWrapper.getSkuDetails().productId)
-                                                        .subscribeOn(Schedulers.io())
-                                                        .observeOn(AndroidSchedulers.mainThread())
-                                                        .subscribe(() -> mAdapterSku.notifyDataSetChanged()));
+//                                        unsubscribeOnDestroy(
+//                                                mBillingService.consumePurchase(skuDetailsWrapper.getSkuDetails().productId)
+//                                                        .subscribeOn(Schedulers.io())
+//                                                        .observeOn(AndroidSchedulers.mainThread())
+//                                                        .subscribe(() -> mAdapterSku.notifyDataSetChanged()));
                                     }
                                 });
                                 mAdapterSku.getItemList().add(reportsItem);

diff --git a/app/src/main/java/com/yoshione/fingen/FgConst.java b/app/src/main/java/com/yoshione/fingen/FgConst.java
@@ -12,6 +12,8 @@ public class FgConst {
     public static final String FRAGMENT_TRANSACTIONS = "transactions";
     //</editor-fold>
 
+    public static final int NUMBER_ITEMS_TO_BE_LOADED = 25;
+
     public static final String TEI_DATETIME = "datetime";
     public static final String TEI_ACCOUNT = "account";
     public static final String TEI_PAYEE_DEST_ACC = "payee_dest_acc";

diff --git a/app/src/main/java/com/yoshione/fingen/FragmentAccounts.java b/app/src/main/java/com/yoshione/fingen/FragmentAccounts.java
@@ -386,7 +386,7 @@ public void initContextMenuAccounts(MenuItem item) {
             case R.id.action_show_transactions: {
                 if (Objects.requireNonNull(getActivity()).getClass().equals(ActivityMain.class)) {
                     ActivityMain activityMain = (ActivityMain) getActivity();
-                    if (activityMain.fragmentTransactions.adapterFilters != null) {
+                    if (activityMain.fragmentTransactions.adapterF != null) {
                         Account account = mAccountsDAO.get().getAccountByID(info.id);
                         AccountFilter filter = new AccountFilter(0);
                         filter.addAccount(account.getID());

diff --git a/app/src/main/java/com/yoshione/fingen/FragmentPayee.java b/app/src/main/java/com/yoshione/fingen/FragmentPayee.java
@@ -1,5 +1,6 @@
 package com.yoshione.fingen;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
@@ -115,9 +116,12 @@ public void afterTextChanged(Editable editable) {
                 if (mCallback.isShowKeyboard()) {
                     if (hasFocus) {
                         new Handler().postDelayed(() -> {
-                            InputMethodManager imm = (InputMethodManager) FragmentPayee.this.getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-                            if (imm != null) {
-                                imm.showSoftInput(v, InputMethodManager.SHOW_IMPLICIT);
+                            Activity activity = FragmentPayee.this.getActivity();
+                            if (activity != null) {
+                                InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                                if (imm != null) {
+                                    imm.showSoftInput(v, InputMethodManager.SHOW_IMPLICIT);
+                                }
                             }
                         }, 200);
                     }