multi text open

Author: PowerExplorer

PowerFileExplorer/src/main/AndroidManifest.xml

@@ -391,7 +391,7 @@
 			android:icon="@drawable/textpng"
 			android:label="Text Editor"
 			android:theme="@style/AppTheme"
-			android:launchMode="standard"
+			android:launchMode="singleInstance"
 		>
 			<intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -93,10 +93,9 @@ public void onViewCreated(final View view, final Bundle savedInstanceState) {
 				}
 			}
 
-			Log.d(TAG, "onViewCreated " + mTabs);
 			pagerAdapter = new PagerAdapter(childFragmentManager);
 			mViewPager.setAdapter(pagerAdapter);
-			Log.d(TAG, "mViewPager " + mViewPager);
+			Log.d(TAG, "onViewCreated mViewPager " + mViewPager + ", mTabs " + mTabs);
 			if (args != null) {
 				mViewPager.setCurrentItem(args.getInt("pos", pageSelected), true);
 			} else {
@@ -454,24 +453,41 @@ public boolean circular() {
 		return true;
 	}
 
+	@Override
+	public void onResume() {
+		Log.d(TAG, "onResume pagerAdapter=" + pagerAdapter + ", mTabs=" + mTabs + ", newIntent " + newIntent);
+		super.onResume();
+		if (newIntent) {
+			newIntent = false;
+			addFrag(main, pagerItem);
+		}
+	}
+	
+	private boolean newIntent = false;
+	private TextFrag main = null;
+	private PagerItem pagerItem = null;
 	public void addTextTab(final Intent intent, String title) {
 		if (title == null || title.length() == 0) {
 			title = "Untitled " + ++TextFrag.no + ".txt";
 		}
-		Log.d(TAG, "addTab1 pagerAdapter=" + pagerAdapter + ", filename=" + title + ", mTabs=" + mTabs);
-		final TextFrag main = TextFrag.newInstance(intent, title, null);
-		final PagerItem pagerItem = new PagerItem(main);
+		Log.d(TAG, "addTextTab1 mViewPager=" + mViewPager + ", pagerAdapter=" + pagerAdapter + ", filename=" + title + ", mTabs=" + mTabs);
+		main = TextFrag.newInstance(intent, title, null);
+		pagerItem = new PagerItem(main);
 		main.slidingTabsFragment = this;
 
-		mTabs.add(mTabs.size() > 1 ? pageSelected : 0, pagerItem);
-		if (mViewPager != null) {
+		if (mViewPager != null && mTabs.size() == 0) {
+			mTabs.add(pagerItem);
 			//addFrag(main, pagerItem);
 			pagerAdapter.notifyDataSetChanged();
 			mViewPager.setCurrentItem(pagerAdapter.getCount() - 1);
 			notifyTitleChange();
 			//main.onPrepareOptionsMenu(((MainActivity)getActivity()).menu);
+		} else if (mTabs.size() >= 1) {
+			newIntent = true;
+		} else {
+			mTabs.add(pagerItem);
 		}
-		Log.d(TAG, "addTab2 " + title + ", " + mTabs);
+		Log.d(TAG, "addTextTab2 " + title + ", " + mTabs);
 	}
 
 	public void addTab(final OpenMode openmode, final String path) {
@@ -512,7 +528,7 @@ private void addFrag(Frag frag, PagerItem pagerItem) {
 		final int size = mTabs.size();
 		if (size > 1) {
 			int currentItem = mViewPager.getCurrentItem();
-			Log.d(TAG, "addTab1 currentItem " + currentItem + ", dir=" + frag.currentPathTitle + ", mTabs=" + mTabs);
+			Log.d(TAG, "addFrag1 currentItem " + currentItem + ", dir=" + frag.currentPathTitle + ", mTabs=" + mTabs);
 
 			PagerItem pi = mTabs.get(0);
 			ft.remove(pi.fakeFrag);
@@ -545,7 +561,7 @@ private void addFrag(Frag frag, PagerItem pagerItem) {
 			mViewPager.setCurrentItem(mTabs.size());
 		}
 		notifyTitleChange();
-		Log.d(TAG, "addTab2 " + frag.currentPathTitle + ", mViewPager.getCurrentItem() " + mViewPager.getCurrentItem() + ", " + mTabs);
+		Log.d(TAG, "addFrag2 " + frag.currentPathTitle + ", mViewPager.getCurrentItem() " + mViewPager.getCurrentItem() + ", " + mTabs);
 	}
 
 	public int realFragCount() {

PowerFileExplorer/src/main/java/net/gnu/texteditor/TextFrag.java

@@ -2731,6 +2731,7 @@ public void updateColor(View rootView) {
 	@Override
     public void onResume() {
         Log.d(TAG, "onResume " + toString());
+		try {
         super.onResume();
 		fragActivity =  this.getActivity();
 		if (mSharedPreferenceChanged ){
@@ -2739,6 +2740,9 @@ public void onResume() {
         if (mBootSettings.hideSoftkeyIS01) {
             IS01FullScreen.setFullScreenOnIS01();//fragActivity
         }
+		} catch (Throwable re) {
+			re.printStackTrace();
+		}
     }
 
     private OnClickListener mOnClickSave = new OnClickListener() {