load in resume

Author: PowerExplorer

PowerFileExplorer/src/main/java/com/veinhorn/scrollgalleryview/ScrollGalleryView.java

@@ -283,6 +283,7 @@ public void onRestoreInstanceState(Parcelable state) {
 			hidden = bundle.getBoolean("hidden", false);
 			final ArrayList<String> lm = (ArrayList<String>) bundle.getStringArrayList("mListOfMedia");
 			if (lm != null && lm.size() > 0) {
+				mListOfMedia = new ArrayList<>();
 				for (String st : lm) {
 					mListOfMedia.add(new File(st));
 				}

PowerFileExplorer/src/main/java/net/gnu/explorer/ArrAdapter.java

@@ -1034,13 +1034,17 @@ public void run() {
 				pagerAdapter.getItem(tabIndex2).open(pos, mDataset);
 				slidingTabsFragment.setCurrentItem(tabIndex2, true);
 			} else {
-				slidingTabsFragment.addTab(Frag.TYPE.PHOTO, fPath);
-				contentFrag.listView.postDelayed(new Runnable() {
-						@Override
-						public void run() {
-							pagerAdapter.getItem(slidingTabsFragment.pageSelected).open(pos, mDataset);
-						}
-					}, 100);
+				final PhotoFragment frag = (PhotoFragment) Frag.getFrag(slidingTabsFragment, Frag.TYPE.PHOTO, fPath);
+				frag.setInitPos(pos);
+				frag.setPaths(mDataset);
+				slidingTabsFragment.addTab(frag);
+//				slidingTabsFragment.addTab(Frag.TYPE.PHOTO, fPath);
+//				contentFrag.listView.postDelayed(new Runnable() {
+//						@Override
+//						public void run() {
+//							pagerAdapter.getItem(slidingTabsFragment.pageSelected).open(pos, mDataset);
+//						}
+//					}, 100);
 			}
 		} else if (mime.startsWith("audio")) {
 			//pagerAdapter.getItem(i = Frag.TYPE.MEDIA.ordinal()).load(fPath);

PowerFileExplorer/src/main/java/net/gnu/explorer/PhotoFragment.java

@@ -68,7 +68,9 @@ public class PhotoFragment extends Frag {
 
 	private long lastModified = 0;
 	private File lastParentFolder;
-
+	private List<LayoutElement> paths = null;
+	private int initPos = 0;
+	
     public PhotoFragment() {
 		super();
 		type = Frag.TYPE.PHOTO;
@@ -149,6 +151,23 @@ public void onViewCreated(final View v, final Bundle savedInstanceState) {
 		}
 	}
 
+	public void setInitPos(int initPos) {
+		this.initPos = initPos;
+	}
+
+	public void setPaths(List<LayoutElement> paths) {
+		this.paths = paths;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (paths != null) {
+			open(initPos, paths);
+			paths = null;
+		}
+	}
+
 	@Override
 	public void open(final int curPos, final List<LayoutElement> paths) {
 		Log.d(TAG, "open list curPos " + curPos + ", paths.size() " + paths.size());

PowerFileExplorer/src/main/java/net/gnu/explorer/SlidingTabsFragment.java

@@ -453,7 +453,11 @@ public void addTab(final OpenMode openmode, final String path) {
 		addFrag(frag, pagerItem);
 	}
 
-	public void addTab(final Frag.TYPE t, final String path) {
+	public void addTab(final Frag frag) {
+		addFrag(frag, new PagerItem(frag));
+	}
+	
+	public Frag addTab(final Frag.TYPE t, final String path) {
 		Log.d(TAG, "addTab TYPE " + t + ", path=" + path + ", mTabs=" + mTabs);
 		final PagerItem pagerItem;
 		final Frag frag;
@@ -463,19 +467,20 @@ public void addTab(final Frag.TYPE t, final String path) {
 				final TextFrag main = TextFrag.newInstance(null, "Untitled " + ++TextFrag.no + ".txt", path);
 				main.slidingTabsFragment = this;
 				pagerItem = new PagerItem(main);
-			} else if (frag.type == Frag.TYPE.EXPLORER) {
+			} else {//}if (frag.type == Frag.TYPE.EXPLORER) {
 				final Frag clone = frag.clone(false);
 				//Log.e(TAG, "addTab frag " + frag);
 				//Log.e(TAG, "addTab clone " + clone);
 				pagerItem = new PagerItem(clone);
-			} else {
-				return;
+			//} else {
+			//	return;
 			}
 		} else {
 			frag = Frag.getFrag(this, t, path);
 			pagerItem = new PagerItem(frag);
 		}
 		addFrag(frag, pagerItem);
+		return frag;
 	}
 
 	private void addFrag(final Frag frag, final PagerItem pagerItem) {

PowerFileExplorer/src/main/java/net/gnu/explorer/TabAction.java

@@ -10,7 +10,7 @@ public interface TabAction {
 	public void closeCurTab();
 	public void closeTab(Frag m);
 	public void closeOtherTabs();
-	public void addTab(final Frag.TYPE t, final String path);//String dir, String suffix, boolean multi, Bundle bundle
+	public Frag addTab(final Frag.TYPE t, final String path);//String dir, String suffix, boolean multi, Bundle bundle
 	public void addTextTab(final Intent intent, final String title);
 	public int realFragCount();
 	public int getFragIndex(final Frag.TYPE t);