Merge branch 'alexanderhudym-fix'

.travis.yml

@@ -1,8 +1,8 @@
 language: android
 env:
   global:
-  - BUILD_TOOLS=26.0.2
-  - ANDROID_SDK=26
+  - BUILD_TOOLS=27.0.0
+  - ANDROID_SDK=27
   - secure: 2DKJSx0H9YSrvkGuF3nGTXA4qZZZs0Mnj3axD12CvE4AUXPMiwQheSeh5Dwd3W0LV6XfmUI6/nZhZf8I+BJObpBTMV6+Swgt1OR/5A8uksJCbUnsOEHBvhdaZgj9tnbM6KfNUqtJnd/E+/iz8XmuU7CJLT7mR750ERqTwj3aTeFZ7yAJn2tD0Zio+CH9V3Vrs3mTIPYkwFpcdcuikKA0Ix04t1K+3+nEeUPusp8/v+v2ViKYEGdfmxFsHcKHAAVpqgXQzGSfkCMEMpfGP+8T4Y7vfPzgO1KyJm6+3FPMN6+6qJBHcvQz77y9ZQE6z/b29ih4xhxHtyhH8R8l2IT6v46JPuQzg+4YkHpDYJye4ffpmYFqgZaTwYaNcktX2ia6bQgqPtvIDfyGJQ0XMClQhZyOlR5ksClYeypGgZgA6i3V2Zrlsc89a8TgmD6UUEUd28utghuBERff9pBML267eZQ1ylex497Fpt6/YXZATuZG7mPWGMJx3Dr/IhKIbvEcZiqM3JsE7+gnOi7LK9UCXC56jzXhvYt5TH8pWJvZ2w3yL4okKuF4OXDgSG5StCJUlMY0YyJ148LdxAPsF3uxkCYDXuKQK+3J7qA4gGoURlta/KPNNJTvurOkxZXKr+HPPMNwwwo1ofPDQx0JtgmbH6te6yZ/LeuQ2d/ZS/LFjh8=
   - secure: UIs6ZiHdo2KP3+6n2VRKLb1sTQELexQG4Lk34/Dlxj7tGLYTmW7gVQqNnFMuHZAfZvx72cBEC/X5XiVb38fp9saj23AStqokVmEz2ACH0MWXPZzYpfz/cY0oxFoI+TiOiShzbdTh/E6av7rhjmvssqa4bEkECHxFOYtRKm41lMM8vBFK6IHj45uqCl4NxavLtTvvT1gRBpsmILmjh4B25W3HAPdW2+twitR5hS4pYxhm1BEjJRNvFMSqzQFywgZqE2ViMa47KHAE1KV2mMsluguLJzy4u3vvpYB2nhIX8qT294ozzokoy5vPst2TGL9etIyERqO+SlizReFe6JORByOCa9nZmxhYjwZADwGtUHeS9+fy+s9AS7JihC4V5yAwypMIZxVeRmiOz88Z53YnnIn4p6Gi8ZGJUmWBV05cg6MHC8T3J0hMh4WqGBag2nhOXMBZ+Tmu38CVEkHN83x8spbjE4ZuUi77m3fXVdIIRcb/YkVrdidXbg5gDmlh18POHya5garPn9lRPkc9gmIZi9sNBuBAbRu1BOkDXrJjoL7NTlUJwP6RMnL1EzXeAD2KnOOLN4jGOD/uUF2CA12KYmug5Y43ER9TUd/6rDGgT2ZI2uEiTJ6Vbqx8lAcUCJ6JY9m/4sU3sTAvf+z7B6/N1ixh4hlkwb1/TAk1eNb2U60=
 jdk:

app/build.gradle

@@ -8,11 +8,11 @@ def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 //TODO edit the changelog as well
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         applicationId "org.iota.wallet"
         minSdkVersion 19
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}" + (versionPatch == 0 ? "" : ".${versionPatch}")
         multiDexEnabled true
@@ -52,7 +52,7 @@ android {
 }
 
 ext {
-    supportLibrary = "26.1.0"
+    supportLibrary = "27.0.1"
 }
 
 dependencies {

app/src/main/java/org/iota/wallet/api/RequestTask.java

@@ -90,11 +90,17 @@ protected void onPostExecute(ApiResponse result) {
         if (BuildConfig.DEBUG) {
             if (result != null)
                 Log.i("ApiResponse", new Gson().toJson(result));
-            Log.i("duration", (new Date().getTime()) - start.getTime() + "");
+            if (start != null) {
+                Log.i("duration", (new Date().getTime()) - start.getTime() + "");
+            }
+        }
+
+        if (result != null) {
+            bus.post(result);
+        } else {
+            bus = null;
         }
 
-        bus.post(result);
-        bus = null;
         TaskManager.removeTask(tag);
     }
 }

app/src/main/java/org/iota/wallet/ui/adapter/TangleExplorerSearchCardAdapter.java

@@ -73,8 +73,6 @@ public void onBindViewHolder(final ViewHolder holder, int position) {
         int adapterPosition = holder.getAdapterPosition();
         Transaction transaction = getItem(adapterPosition - 1);
 
-        holder.setIsRecyclable(true);
-
         holder.hashLabel.setText(transaction.getHash());
         holder.addressLabel.setText(transaction.getAddress());
         if (NumberUtils.isCreatable(String.valueOf(transaction.getValue()))) {

app/src/main/java/org/iota/wallet/ui/adapter/TangleExplorerTransactionsCardAdapter.java

@@ -92,24 +92,19 @@ public void onBindViewHolder(final ViewHolder holder, int position) {
 
         holder.hashLabel.setText(transaction.getHash());
         holder.addressLabel.setText(transaction.getAddress());
-        if (NumberUtils.isCreatable(String.valueOf(transaction.getValue()))) {
-            holder.valueLabel.setText(IotaUnitConverter.convertRawIotaAmountToDisplayText(transaction.getValue(), false));
-            try {
-                Currency currency = Utils.getConfiguredAlternateCurrency(context);
-                String text = AlternateValueUtils.formatAlternateBalanceText(
-                        new AlternateValueManager(context).convert(transaction.getValue(), currency), currency);
-                holder.alternativeValueLabel.setText(text);
-            } catch (ExchangeRateNotAvailableException e) {
-                holder.alternativeValueLabel.setText(R.string.na);
-            }
-            if (transaction.getValue() < 0) {
-                holder.valueLabel.setTextColor(ContextCompat.getColor(context, R.color.flatRed));
-            } else if (transaction.getValue() > 0) {
-                holder.valueLabel.setTextColor(ContextCompat.getColor(context, R.color.flatGreen));
-            }
-
-        } else {
-            holder.valueLabel.setText(String.valueOf(transaction.getValue()));
+        holder.valueLabel.setText(IotaUnitConverter.convertRawIotaAmountToDisplayText(transaction.getValue(), false));
+        try {
+            Currency currency = Utils.getConfiguredAlternateCurrency(context);
+            String text = AlternateValueUtils.formatAlternateBalanceText(
+                    new AlternateValueManager(context).convert(transaction.getValue(), currency), currency);
+            holder.alternativeValueLabel.setText(text);
+        } catch (ExchangeRateNotAvailableException e) {
+            holder.alternativeValueLabel.setText(R.string.na);
+        }
+        if (transaction.getValue() < 0) {
+            holder.valueLabel.setTextColor(ContextCompat.getColor(context, R.color.flatRed));
+        } else if (transaction.getValue() > 0) {
+            holder.valueLabel.setTextColor(ContextCompat.getColor(context, R.color.flatGreen));
         }
         holder.tagLabel.setText(transaction.getTag());
         holder.timestampLabel.setText(Utils.timeStampToDate(transaction.getTimestamp()));

app/src/main/java/org/iota/wallet/ui/adapter/WalletPagerAdapter.java

@@ -34,7 +34,6 @@
 
 public class WalletPagerAdapter extends FragmentPagerAdapter {
 
-    private static final int TAB_COUNT = 2;
     private final Context context;
     private List<Fragment> fragments = new ArrayList<>();
 
@@ -52,7 +51,7 @@ public Fragment getItem(int position) {
 
     @Override
     public int getCount() {
-        return TAB_COUNT;
+        return fragments.size();
     }
 
     @Override
@@ -66,11 +65,4 @@ public CharSequence getPageTitle(int position) {
         return null;
     }
 
-
-    public void performFabClick(int position) {
-        Fragment fragment = fragments.get(position);
-        if (fragment != null && fragment instanceof WalletTabFragment.OnFabClickListener) {
-            ((WalletTabFragment.OnFabClickListener) fragment).onFabClick();
-        }
-    }
 }

app/src/main/java/org/iota/wallet/ui/adapter/WalletTransfersCardAdapter.java

@@ -86,8 +86,6 @@ public void onBindViewHolder(final ViewHolder holder, int position) {
         int adapterPosition = holder.getAdapterPosition();
         Transfer transfer = getItem(adapterPosition - 1);
 
-        holder.setIsRecyclable(true);
-
         holder.valueLabel.setText(IotaUnitConverter.convertRawIotaAmountToDisplayText(transfer.getValue(), false));
         holder.addressLabel.setText(transfer.getAddress());
         holder.messageLabel.setText(TextUtils.isEmpty(transfer.getMessage()) ? "-" : transfer.getMessage());

app/src/main/java/org/iota/wallet/ui/fragment/WalletAddressesFragment.java

@@ -162,6 +162,7 @@ private void getNodeInfo() {
         }
     }
 
+    @Override
     public void onFabClick() {
         generateNewAddress();
     }

app/src/main/java/org/iota/wallet/ui/fragment/WalletTabFragment.java

@@ -83,14 +83,14 @@ public class WalletTabFragment extends Fragment {
     private AlternateValueManager alternateValueManager;
     private boolean isConnected = false;
     private WalletPagerAdapter adapter;
-    private int currentPagerPosition = 0;
 
     private Unbinder unbinder;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         alternateValueManager = new AlternateValueManager(getActivity());
+        adapter = new WalletPagerAdapter(getActivity(), getChildFragmentManager());
     }
 
     @Nullable
@@ -105,11 +105,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ((AppCompatActivity) getActivity()).setSupportActionBar(walletToolbar);
-        setViewPager();
+        viewPager.setAdapter(adapter);
+        tabLayout.setupWithViewPager(viewPager);
+        viewPager.addOnPageChangeListener(onPageChangeListener);
     }
 
     @Override
     public void onDestroyView() {
+        viewPager.removeOnPageChangeListener(onPageChangeListener);
         if (unbinder != null) {
             unbinder.unbind();
             unbinder = null;
@@ -120,30 +123,11 @@ public void onDestroyView() {
     @OnClick(R.id.fab_wallet)
     public void onFabWalletClick() {
         if (isConnected && adapter != null) {
-            adapter.performFabClick(currentPagerPosition);
-        }
-    }
-
-    private void setViewPager() {
-        adapter = new WalletPagerAdapter(getActivity(), getChildFragmentManager());
-        viewPager.setAdapter(adapter);
-        tabLayout.setupWithViewPager(viewPager);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                currentPagerPosition = position;
-                updateFab();
+            Fragment currentFragment = adapter.getItem(viewPager.getCurrentItem());
+            if (currentFragment != null && currentFragment instanceof WalletTabFragment.OnFabClickListener) {
+                ((OnFabClickListener) currentFragment).onFabClick();
             }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-            }
-        });
+        }
     }
 
     @Subscribe
@@ -156,7 +140,6 @@ public void onEvent(GetAccountDataResponse gad) {
 
         isConnected = true;
 
-        currentPagerPosition = viewPager.getCurrentItem();
         updateFab();
 
         walletBalanceIota = 0;
@@ -182,7 +165,7 @@ private void updateFab() {
             fabWallet.show();
             fabWallet.setEnabled(true);
 
-            switch (currentPagerPosition) {
+            switch (viewPager.getCurrentItem()) {
                 case 0:
                     fabWallet.setImageResource(R.drawable.ic_fab_send);
                     break;
@@ -200,7 +183,6 @@ public void onEvent(NetworkError error) {
             case IOTA_COOL_NETWORK_ERROR:
             case NETWORK_ERROR:
                 isConnected = false;
-                currentPagerPosition = viewPager.getCurrentItem();
                 updateFab();
                 break;
         }
@@ -285,4 +267,21 @@ public void onPause() {
     public interface OnFabClickListener {
         void onFabClick();
     }
+
+    private ViewPager.OnPageChangeListener onPageChangeListener = new ViewPager.OnPageChangeListener() {
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            updateFab();
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+
+        }
+    };
 }

app/src/main/java/org/iota/wallet/ui/fragment/WalletTransfersFragment.java

@@ -185,22 +185,21 @@ private void getNodeInfo() {
         rt.startNewRequestTask(nir);
 
         if (!swipeRefreshLayout.isRefreshing()) {
-            swipeRefreshLayout.post(new Runnable() {
-                @Override
-                public void run() {
-                    swipeRefreshLayout.setRefreshing(true);
-                }
-            });
+            swipeRefreshLayout.post(() -> swipeRefreshLayout.setRefreshing(true));
         }
     }
 
+    @Override
     public void onFabClick() {
         Fragment fragment = new NewTransferFragment();
-        getActivity().getFragmentManager().beginTransaction()
-                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-                .add(R.id.container, fragment, null)
-                .addToBackStack(null)
-                .commit();
+        Fragment parentFragment = getParentFragment();
+        if (parentFragment != null) {
+            parentFragment.getFragmentManager().beginTransaction()
+                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                    .add(R.id.container, fragment, null)
+                    .addToBackStack(null)
+                    .commit();
+        }
     }
 
     @Override