From 1fa442dbd9002d7b387034a1feb9d0877df812ae Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Mon, 15 Oct 2018 17:13:07 +0200
Subject: [PATCH] removed Last_Fragment

---
 .../java/de/sebse/fuplanner/MainActivity.java | 28 +++----------------
 .../moddetails/ModDetailFragment.java         |  5 +++-
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index dcd70b0..a3fde9d 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -54,13 +54,8 @@ public class MainActivity extends AppCompatActivity
     private static final int FRAGMENT_CANTEENS_DETAILS = 6;
     private static final int FRAGMENT_PREFERENCES = 7;
 
-    //zum Speichern des angezeigten Fragments bei einem erneuten login (z.B. Cookies abgelaufen)
-    private int last_Fragment = FRAGMENT_NONE;
-    private String last_Fragment_id = "";
-
     private static final String ARG_FRAGMENT_PAGE = "fragment_page";
     private static final String ARG_FRAGMENT_STATUS = "fragment_status";
-    private static final String ARG_LOGIN_STATUS = "login_status";
 
     private FragmentManager mFragmentManager;
     private GoogleAuth mGoogleAuth;
@@ -98,7 +93,6 @@ public class MainActivity extends AppCompatActivity
         mFragmentManager = getSupportFragmentManager();
 
         LoginToken loginToken = getKVV().easyLogin();
-        log.d(loginToken, last_Fragment, last_Fragment_id, newFragmentPage, newFragmentData);
         if (loginToken == null) {
             checkAndDoLogin();
         } else {
@@ -245,17 +239,15 @@ public class MainActivity extends AppCompatActivity
 
     private int getDefaultFragmentAfterLogin(String[] id) {
         //log.d("Cookies last_Fragment", last_Fragment);
-        if (last_Fragment == FRAGMENT_NONE){
-            id[0]="";
+        if (fragmentPage == FRAGMENT_NONE){
+            id[0] = "";
             return FRAGMENT_MODULES;
         }
         else {
             //log.d("changeFragment last_Fragment_id gesetzt", last_Fragment_id);
-            id[0] = last_Fragment_id;
-            return last_Fragment;
+            id[0] = fragmentData;
+            return fragmentPage;
         }
-
-
     }
 
     private void toLogoutState() {
@@ -311,39 +303,27 @@ public class MainActivity extends AppCompatActivity
         switch (newFragment) {
             case FRAGMENT_MODULES:
                 fragment = ModulesFragment.newInstance();
-                last_Fragment = FRAGMENT_MODULES;
-                last_Fragment_id = "";
                 break;
             case FRAGMENT_MODULES_DETAILS:
                 fragment = ModDetailFragment.newInstance(newData);
-                last_Fragment = FRAGMENT_MODULES_DETAILS;
-                last_Fragment_id = newData;
                 break;
             case FRAGMENT_LOGIN:
                 fragment = LoginFragment.newInstance();
                 break;
             case FRAGMENT_SCHEDULE:
                 fragment = ScheduleFragment.newInstance();
-                last_Fragment = FRAGMENT_SCHEDULE;
-                last_Fragment_id = "";
                 break;
             case FRAGMENT_CANTEENS:
                 fragment = CanteensFragment.newInstance();
-                last_Fragment = FRAGMENT_CANTEENS;
-                last_Fragment_id = "";
                 break;
             case FRAGMENT_CANTEENS_DETAILS:
                 fragment = DaySwitcherFragment.newInstance(Integer.parseInt(newData));
-                last_Fragment = FRAGMENT_NONE;
-                last_Fragment_id = newData;
                 break;
             case FRAGMENT_PREFERENCES:
                 fragment = PrefsFragment.newInstance();
-                //last_Fragment = FRAGMENT_NONE;
                 break;
             default:  // FRAGMENT_STARTUP
                 fragment = StartupFragment.newInstance();
-                //last_Fragment = FRAGMENT_NONE;
                 break;
         }
 
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java
index de29044..1696933 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java
@@ -31,6 +31,7 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
     private MainAcitivityListener mListener;
     private final Logger log = new Logger(this);
     private ViewPager mViewPager;
+    private String mPageRestoreRequest = null;
 
     public ModDetailFragment() {
         // Required empty public constructor
@@ -46,7 +47,7 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
     public static Fragment newInstance(String itemPosition) {
         ModDetailFragment fragment = new ModDetailFragment();
         Bundle args = new Bundle();
-        args.putString(ARG_POSITION, itemPosition);
+        args.putString(ARG_POSITION, itemPosition);//+"."+0);
         fragment.setArguments(args);
         return fragment;
     }
@@ -54,8 +55,10 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        log.d("load instance");
         if (getArguments() != null) {
             mItemPos = getArguments().getString(ARG_POSITION);
+
         }
         if (mListener != null) {
             mListener.onTitleTextChange(R.string.courses);