diff --git a/qBittorrentClient/AndroidManifest.xml b/qBittorrentClient/AndroidManifest.xml index 7b123dfd..936d16f8 100644 --- a/qBittorrentClient/AndroidManifest.xml +++ b/qBittorrentClient/AndroidManifest.xml @@ -11,8 +11,8 @@ --> + android:versionCode="232" + android:versionName="2.3.2" > ", "About to set Adapter"); + myAdapter myadapter = new myAdapter(MainActivity.this, names, lines); + firstFragment.setListAdapter(myadapter); + + // myadapter.notifyDataSetChanged(); // Create the about fragment AboutFragment aboutFragment = new AboutFragment(); + // Add the fragment to the 'list_frame' FrameLayout + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + // Got some results if (torrentsFiltered.size() > 0) { - // Add the fragment to the 'list_frame' FrameLayout - FragmentManager fragmentManager = getFragmentManager(); - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - - // Set the second fragments container + // Assign the first and second fragment, and + // set the second fragment container if (findViewById(R.id.fragment_container) != null) { - firstFragment.setSecondFragmentContainer(R.id.content_frame); - - if (getFragmentManager().findFragmentByTag("firstFragment") == null) { - - fragmentTransaction.replace(R.id.one_frame, firstFragment, "firstFragment"); - } - - } else { - firstFragment.setSecondFragmentContainer(R.id.one_frame); - fragmentTransaction.replace(R.id.one_frame, firstFragment); - } - - fragmentTransaction.commit(); - - ListView lv = firstFragment.getListView(); - - lv.setChoiceMode(ListView.CHOICE_MODE_SINGLE); - // Also update the second fragment (if it comes from the - // drawer) - if (params[2].equals("clear") && lv.getCount() > 0) { - - // Scroll to the first position - lv.smoothScrollToPosition(0); - - // Notify there isn't any item selected - // firstFragment.setSelection(-1); - - if (findViewById(R.id.fragment_container) != null) { - - // Reset the BackStack (Back button) - fragmentManager = getFragmentManager(); - - for (int i = 0; i < getFragmentManager().getBackStackEntryCount(); ++i) { - fragmentManager.popBackStack("secondFragment", FragmentManager.POP_BACK_STACK_INCLUSIVE); - } - - // Replace with the about fragment - fragmentManager.beginTransaction().replace(R.id.content_frame, aboutFragment).commit(); - - } else { + // Set where is the second container + firstFragment.setSecondFragmentContainer(R.id.content_frame); - // Just one fragment - // Reset the BackStack (Back button) - fragmentManager = getFragmentManager(); - for (int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) { - fragmentManager.popBackStack(); - } + // Set first fragment + fragmentTransaction.replace(R.id.list_frame, firstFragment); - // Replace with the about fragment - if (fragmentManager.findFragmentByTag("firstFragment") == null) { - // Replace with the about fragment - fragmentManager.beginTransaction().replace(R.id.one_frame, firstFragment, "firstFragment").commit(); - } + // Reset back button stack + for (int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) { + fragmentManager.popBackStack("secondFragment", FragmentManager.POP_BACK_STACK_INCLUSIVE); } - } - - if (params[2].equals("") && lv.getCount() > 0) { - - // Scroll listView to the first position - lv.smoothScrollToPosition(0); - - if (aboutFragment != null) { - - if (findViewById(R.id.fragment_container) != null) { - - // Reset the BackStack (Back button) - fragmentManager = getFragmentManager(); - - for (int i = 0; i < getFragmentManager().getBackStackEntryCount(); ++i) { - getFragmentManager().popBackStack("secondFragment", FragmentManager.POP_BACK_STACK_INCLUSIVE); - } - - fragmentManager = getFragmentManager(); - fragmentManager.beginTransaction().replace(R.id.content_frame, aboutFragment).commit(); - - } - - else { + // Set second fragment with About fragment + fragmentTransaction.replace(R.id.content_frame, aboutFragment); - fragmentManager = getFragmentManager(); + } else { - if (fragmentManager.findFragmentByTag("firstFragment") == null) { + // Set where is the second container + firstFragment.setSecondFragmentContainer(R.id.one_frame); - fragmentManager.beginTransaction().replace(R.id.one_frame, firstFragment, "firstFragment").commit(); - } + // Set first and only fragment + fragmentTransaction.replace(R.id.one_frame, firstFragment, "firstFragment"); - } + // Reset back button stack + for (int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) { + fragmentManager.popBackStack(); } - } } else { @@ -1657,26 +1590,27 @@ protected void onPostExecute(Torrent[] result) { String[] emptyList = new String[] { getString(R.string.no_results) }; firstFragment.setListAdapter(new ArrayAdapter(MainActivity.this, R.layout.no_items_found, R.id.no_results, emptyList)); - // Add the fragment to the 'list_frame' FrameLayout - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - // Set the second fragments container if (findViewById(R.id.fragment_container) != null) { firstFragment.setSecondFragmentContainer(R.id.content_frame); fragmentTransaction.replace(R.id.list_frame, firstFragment); fragmentTransaction.replace(R.id.content_frame, aboutFragment); - fragmentTransaction.commit(); } else { firstFragment.setSecondFragmentContainer(R.id.one_frame); - if (getFragmentManager().findFragmentByTag("firstFragment") == null) { - fragmentTransaction.replace(R.id.one_frame, firstFragment, "firstFragment"); + fragmentTransaction.replace(R.id.one_frame, firstFragment, "firstFragment"); + + // Reset back button stack + for (int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) { + fragmentManager.popBackStack(); } - fragmentTransaction.commit(); } } + // Commit + fragmentTransaction.commit(); + } // catch(IllegalStateException le){ // @@ -1872,22 +1806,22 @@ private void selectItem(int position) { switch (position) { case 0: - refresh("all", true); + refresh("all"); break; case 1: - refresh("downloading", true); + refresh("downloading"); break; case 2: - refresh("completed", true); + refresh("completed"); break; case 3: - refresh("paused", true); + refresh("paused"); break; case 4: - refresh("active", true); + refresh("active"); break; case 5: - refresh("inactive", true); + refresh("inactive"); break; case 6: // Options - Execute the task in background