Merge branch 'develop' of github.com:loopeer/code-reader into develop

MlxChange · MlxChange · commit e61a2e2528dc · 2017-08-29T14:40:59.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -67,6 +67,7 @@ android {
     }
     buildToolsVersion '25.0.0'
 
+
 }
 
 dependencies {
diff --git a/app/src/main/java/com/loopeer/codereader/ui/activity/AddRepoActivity.java b/app/src/main/java/com/loopeer/codereader/ui/activity/AddRepoActivity.java
@@ -61,6 +61,7 @@ public void check(boolean b) {
     public void onClick() {
         hideSoftInputMethod();
 
+
         Repo repo = new Repo(
                 mAddRepoChecker.repoName.trim()
                 , FileCache.getInstance().getRepoAbsolutePath(mAddRepoChecker.repoName)
@@ -69,20 +70,7 @@ public void onClick() {
                 , 0);
         Navigator.startDownloadNewRepoService(this, repo);
 //        this.finish();
-/*=======
-        if (!DownloadUrlParser.parseGithubUrlAndDownload(this, mAddRepoChecker.repoDownloadUrl.trim())) {
-            showMessage(getString(R.string.repo_download_url_parse_error));
-        } else {
-            Repo repo = new Repo(
-                    mAddRepoChecker.repoName.trim()
-                    , FileCache.getInstance().getRepoAbsolutePath(mAddRepoChecker.repoName)
-                    , mAddRepoChecker.repoDownloadUrl.trim()
-                    , true
-                    , 0);
-            Navigator.startDownloadNewRepoService(this, repo);
-            this.finish();
-        }
->>>>>>> add the url check at addRepoActivity*/
+
     }
 }
 
diff --git a/app/src/main/java/com/loopeer/codereader/ui/fragment/CodeReadFragment.java b/app/src/main/java/com/loopeer/codereader/ui/fragment/CodeReadFragment.java
@@ -171,45 +171,7 @@ public void openFile(DirectoryNode node) {
     }
 
     protected void openCodeFile() {
-/*<<<<<<< HEAD
-        Observable.create(new Observable.OnSubscribe<String>() {
-            @Override
-            public void call(Subscriber<? super String> subscriber) {
-                InputStream stream = null;
-                try {
-                    stream = new FileInputStream(mNode.absolutePath);
-                } catch (FileNotFoundException e) {
-                    e.printStackTrace();
-                }
-                if (stream == null) {
-                    subscriber.onCompleted();
-                    return;
-                }
-                final InputStream finalStream = stream;
-                String[] names = mNode.name.split("\\.");
-                String fileTypeName = names[names.length - 1];
-                if (BrushMap.isBlackFile(fileTypeName)) {
-                    subscriber.onError(new Throwable("Can not open this file!"));
-                    subscriber.onCompleted();
-                    return;
-                }
-                String jsFile = BrushMap.getJsFileForExtension(fileTypeName);
-                if (jsFile == null) {
-                    jsFile = "Txt";
-                }
-                StringBuilder sb = new StringBuilder();
-                StringBuilder localStringBuilder = new StringBuilder();
-                try {
-                    BufferedReader localBufferedReader = new BufferedReader(
-                            new InputStreamReader(finalStream, "UTF-8"));
-                    for (; ; ) {
-                        String str = localBufferedReader.readLine();
-                        if (str == null) {
-                            break;
-                        }
-                        localStringBuilder.append(str);
-                        localStringBuilder.append("\n");*/
-//=======
+
         Observable.create((Observable.OnSubscribe<String>) subscriber -> {
             InputStream stream = null;
             try {
@@ -236,7 +198,7 @@ public void call(Subscriber<? super String> subscriber) {
                     String str = localBufferedReader.readLine();
                     if (str == null) {
                         break;
-//>>>>>>> fix bug
+
                     }
                     localStringBuilder.append(str);
                     localStringBuilder.append("\n");
diff --git a/gradle.properties b/gradle.properties
@@ -5,8 +5,10 @@ compile_sdk_version=24
 version_code=9
 version_name=1.0.2
 
+
 support_version=25.0.1
 support_design_version=24.2.0
+
 butterknife_version=8.2.1
 markdownj=0.4
 retrofit=2.1.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,6 @@
 
+
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ android {`
`67`	`67`	`}`
`68`	`68`	`buildToolsVersion '25.0.0'`
`69`	`69`
	`70`	`+`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`dependencies {`