Skip to content

Commit 2d7f91b

Browse files
committed
cleanup code, add common io dependencies
1 parent 25d80c3 commit 2d7f91b

File tree

11 files changed

+15
-13
lines changed

11 files changed

+15
-13
lines changed

.idea/modules.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common-release/build.gradle

Lines changed: 0 additions & 2 deletions
This file was deleted.

common-release/common-release.aar

-30 KB
Binary file not shown.

lib-n-ide/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@ dependencies {
5050
testImplementation 'org.json:json:20180130'
5151
implementation fileTree(dir: 'libs', include: ['*.jar'])
5252

53-
api project(':common-release')
5453
api 'com.google.code.gson:gson:2.8.1'
5554
api 'com.anjlab.android.iab.v3:library:1.0.44'
5655

5756
api 'com.yqritc:recyclerview-flexibledivider:1.2.9'
5857
api 'org.apmem.tools:layouts:1.10@aar'
5958
api 'com.makeramen:roundedimageview:2.2.1'
6059
api 'com.sothree.slidinguppanel:library:3.4.0'
60+
//noinspection GradleDependency do not use latest version, java 8 cause crash
61+
api 'commons-io:commons-io:2.3'
6162
api 'com.simplecityapps:recyclerview-fastscroll:1.0.18'
6263
api 'org.apache.commons:commons-lang3:3.7'
6364
api 'com.google.guava:guava:25.1-android'

lib-n-ide/src/main/java/com/duy/file/explorer/io/LocalFile.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919

2020
import android.os.Parcel;
2121

22-
import com.duy.common.io.IOUtils;
2322
import com.duy.file.explorer.ExplorerException;
2423
import com.duy.file.explorer.listener.BoolResultListener;
2524
import com.duy.file.explorer.listener.FileListResultListener;
2625
import com.duy.file.explorer.listener.ProgressUpdateListener;
2726

27+
import org.apache.commons.io.IOUtils;
28+
2829
import java.io.File;
2930
import java.io.FileInputStream;
3031
import java.io.FileOutputStream;

lib-n-ide/src/main/java/com/duy/ide/core/api/IdeActivity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import android.widget.Toast;
5555

5656
import com.duy.common.StoreUtil;
57-
import com.duy.common.io.IOUtils;
5857
import com.duy.file.explorer.FileExplorerActivity;
5958
import com.duy.ide.code.api.CodeFormatProvider;
6059
import com.duy.ide.code.format.CodeFormatProviderImpl;
@@ -94,10 +93,12 @@
9493
import com.ogaclejapan.smarttablayout.SmartTabLayout;
9594
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
9695

96+
import org.apache.commons.io.IOUtils;
9797
import org.gjt.sp.jedit.Catalog;
9898
import org.gjt.sp.jedit.Mode;
9999

100100
import java.io.File;
101+
import java.io.FileOutputStream;
101102
import java.io.InputStream;
102103
import java.util.List;
103104
import java.util.Map;
@@ -720,7 +721,9 @@ private void openText(CharSequence content) {
720721
File newFile = fileManager.createNewFile(
721722
"untitled_" + System.currentTimeMillis() + ".txt");
722723
try {
723-
IOUtils.writeAndClose(content.toString(), newFile);
724+
FileOutputStream output = new FileOutputStream(newFile);
725+
IOUtils.write(content.toString(), output);
726+
output.close();
724727
mTabManager.newTab(newFile);
725728
} catch (Exception e) {
726729
Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();

lib-n-ide/src/main/java/com/duy/ide/database/JsonDatabase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
import android.content.Context;
2121
import android.text.TextUtils;
2222

23-
import com.duy.common.io.IOUtils;
24-
23+
import org.apache.commons.io.IOUtils;
2524
import org.json.JSONArray;
2625
import org.json.JSONException;
2726
import org.json.JSONObject;

lib-n-ide/src/main/java/com/duy/ide/editor/theme/EditorThemeFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import android.widget.ProgressBar;
3636
import android.widget.TextView;
3737

38-
import com.duy.common.io.IOUtils;
3938
import com.duy.ide.editor.Highlighter;
4039
import com.duy.ide.editor.editor.R;
4140
import com.duy.ide.editor.theme.model.Constants;
@@ -45,6 +44,7 @@
4544
import com.jecelyin.editor.v2.highlight.Buffer;
4645
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
4746

47+
import org.apache.commons.io.IOUtils;
4848
import org.gjt.sp.jedit.Catalog;
4949
import org.gjt.sp.jedit.Mode;
5050

lib-n-ide/src/main/java/com/duy/ide/editor/theme/ThemeLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
import android.content.res.AssetManager;
2222

2323
import com.duy.common.DLog;
24-
import com.duy.common.io.IOUtils;
2524
import com.duy.ide.editor.theme.model.EditorTheme;
2625

26+
import org.apache.commons.io.IOUtils;
27+
2728
import java.io.IOException;
2829
import java.io.InputStream;
2930
import java.io.StringReader;

lib-n-ide/src/main/java/com/jecelyin/editor/v2/io/LocalFileWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import android.support.annotation.NonNull;
2020
import android.text.GetChars;
2121

22-
import com.duy.common.io.IOUtils;
22+
import org.apache.commons.io.IOUtils;
2323

2424
import java.io.File;
2525
import java.io.FileOutputStream;

0 commit comments

Comments
 (0)