shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update libs, fix required bugs after update libs, bump app ver

Browse Source
This commit is contained in:
M M Arif
2020-03-16 14:25:15 +05:00
parent fe22d8ab42
commit 375c12b192
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
View File

@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.FileUtils;
import org.mian.gitnex.R;
import org.mian.gitnex.adapters.FilesDiffAdapter;
import org.mian.gitnex.clients.RetrofitClient;
@ -121,7 +121,7 @@ public class FileDiffActivity extends BaseActivity {
}
}
String fileExtension = FilenameUtils.getExtension(fileNameFinal);
String fileExtension = FileUtils.getExtension(fileNameFinal);
String fileContentsFinalWithBlankLines = fileContentsFinal.replaceAll( ".*@@.*", "" );
String fileContentsFinalWithoutBlankLines = fileContentsFinal.replaceAll( ".*@@.*(\r?\n|\r)?", "" );
@ -140,9 +140,9 @@ public class FileDiffActivity extends BaseActivity {
String binaryFileRaw = binaryFile[1].substring(binaryFile[1].indexOf('\n')+1);
String binaryFileFinal = binaryFile[1].substring(binaryFileRaw.indexOf('\n')+1);
String fileExtension = FilenameUtils.getExtension(getFileNameFinal);
String fileExtension = FileUtils.getExtension(getFileNameFinal);
if(appUtil.imageExtension(FilenameUtils.getExtension(getFileNameFinal))) {
if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
}

4
app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
View File

@ -30,7 +30,7 @@ import com.github.barteksc.pdfviewer.util.FitPolicy;
import com.github.chrisbanes.photoview.PhotoView;
import com.pddstudio.highlightjs.HighlightJsView;
import com.pddstudio.highlightjs.models.Theme;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.FileUtils;
import org.mian.gitnex.R;
import org.mian.gitnex.clients.RetrofitClient;
import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
@ -149,7 +149,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
if(!response.body().getContent().equals("")) {
String fileExtension = FilenameUtils.getExtension(filename);
String fileExtension = FileUtils.getExtension(filename);
mProgressBar.setVisibility(View.GONE);
// download file meta