mirror of https://codeberg.org/gitnex/GitNex.git
Pull Diff View: Use new API if gitea >= 1.13.0 (#536)
right arg order & right instanceUrl use new API if gitea >= 1.13.0 correct name format code Co-authored-by: 6543 <6543@obermui.de> Reviewed-by: opyale <opyale@noreply.codeberg.org>
This commit is contained in:
6543
parent
42640f2d1c
commit
50e0142f6c
|
|
@ -16,6 +16,7 @@ import org.mian.gitnex.adapters.FilesDiffAdapter;
|
||||||
import org.mian.gitnex.clients.RetrofitClient;
|
import org.mian.gitnex.clients.RetrofitClient;
|
||||||
import org.mian.gitnex.helpers.AlertDialogs;
|
import org.mian.gitnex.helpers.AlertDialogs;
|
||||||
import org.mian.gitnex.helpers.Toasty;
|
import org.mian.gitnex.helpers.Toasty;
|
||||||
|
import org.mian.gitnex.helpers.Version;
|
||||||
import org.mian.gitnex.models.FileDiffView;
|
import org.mian.gitnex.models.FileDiffView;
|
||||||
import org.mian.gitnex.util.AppUtil;
|
import org.mian.gitnex.util.AppUtil;
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
|
|
@ -32,191 +33,205 @@ import retrofit2.Callback;
|
||||||
|
|
||||||
public class FileDiffActivity extends BaseActivity {
|
public class FileDiffActivity extends BaseActivity {
|
||||||
|
|
||||||
private View.OnClickListener onClickListener;
|
private View.OnClickListener onClickListener;
|
||||||
private TextView toolbar_title;
|
private TextView toolbar_title;
|
||||||
private ListView mListView;
|
private ListView mListView;
|
||||||
private ProgressBar mProgressBar;
|
private ProgressBar mProgressBar;
|
||||||
final Context ctx = this;
|
final Context ctx = this;
|
||||||
private Context appCtx;
|
private Context appCtx;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayoutResourceId(){
|
protected int getLayoutResourceId() {
|
||||||
return R.layout.activity_file_diff;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
return R.layout.activity_file_diff;
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
}
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
@Override
|
||||||
appCtx = getApplicationContext();
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
super.onCreate(savedInstanceState);
|
||||||
setSupportActionBar(toolbar);
|
appCtx = getApplicationContext();
|
||||||
|
|
||||||
final TinyDB tinyDb = new TinyDB(appCtx);
|
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||||
String repoFullName = tinyDb.getString("repoFullName");
|
setSupportActionBar(toolbar);
|
||||||
String[] parts = repoFullName.split("/");
|
|
||||||
final String repoOwner = parts[0];
|
|
||||||
final String repoName = parts[1];
|
|
||||||
final String instanceUrl = tinyDb.getString("instanceUrl");
|
|
||||||
final String loginUid = tinyDb.getString("loginUid");
|
|
||||||
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
|
||||||
|
|
||||||
ImageView closeActivity = findViewById(R.id.close);
|
final TinyDB tinyDb = new TinyDB(appCtx);
|
||||||
toolbar_title = findViewById(R.id.toolbar_title);
|
String repoFullName = tinyDb.getString("repoFullName");
|
||||||
mListView = findViewById(R.id.listView);
|
String[] parts = repoFullName.split("/");
|
||||||
mProgressBar = findViewById(R.id.progress_bar);
|
final String repoOwner = parts[0];
|
||||||
|
final String repoName = parts[1];
|
||||||
|
final String loginUid = tinyDb.getString("loginUid");
|
||||||
|
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
||||||
|
|
||||||
mListView.setDivider(null);
|
ImageView closeActivity = findViewById(R.id.close);
|
||||||
|
toolbar_title = findViewById(R.id.toolbar_title);
|
||||||
|
mListView = findViewById(R.id.listView);
|
||||||
|
mProgressBar = findViewById(R.id.progress_bar);
|
||||||
|
|
||||||
toolbar_title.setText(R.string.processingText);
|
mListView.setDivider(null);
|
||||||
initCloseListener();
|
|
||||||
closeActivity.setOnClickListener(onClickListener);
|
|
||||||
|
|
||||||
mProgressBar.setVisibility(View.VISIBLE);
|
toolbar_title.setText(R.string.processingText);
|
||||||
|
initCloseListener();
|
||||||
|
closeActivity.setOnClickListener(onClickListener);
|
||||||
|
|
||||||
String pullIndex = tinyDb.getString("issueNumber");
|
mProgressBar.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
getPullDiffContent(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, pullIndex);
|
String pullIndex = tinyDb.getString("issueNumber");
|
||||||
|
|
||||||
}
|
boolean apiCall = true;
|
||||||
|
String instanceUrl = tinyDb.getString("instanceUrl");
|
||||||
|
|
||||||
private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) {
|
// fallback for old gitea instances
|
||||||
|
if(new Version(tinyDb.getString("giteaVersion")).less("1.13.0")) {
|
||||||
|
apiCall = true;
|
||||||
|
instanceUrl = tinyDb.getString("instanceUrlWithProtocol");
|
||||||
|
}
|
||||||
|
|
||||||
Call<ResponseBody> call = RetrofitClient
|
getPullDiffContent(instanceUrl, repoOwner, repoName, pullIndex, instanceToken, apiCall);
|
||||||
.getInstance(instanceUrl, ctx)
|
|
||||||
.getWebInterface()
|
|
||||||
.getPullDiffContent(owner, repo, filename);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<ResponseBody>() {
|
}
|
||||||
|
|
||||||
@Override
|
private void getPullDiffContent(String instanceUrl, String owner, String repo, String pullIndex, String token, boolean apiCall) {
|
||||||
public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
|
|
||||||
|
|
||||||
if (response.code() == 200) {
|
Call<ResponseBody> call;
|
||||||
|
if(apiCall) {
|
||||||
|
call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getPullDiffContent(token, owner, repo, pullIndex);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
call = RetrofitClient.getInstance(instanceUrl, ctx).getWebInterface().getPullDiffContent(owner, repo, pullIndex);
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
call.enqueue(new Callback<ResponseBody>() {
|
||||||
assert response.body() != null;
|
|
||||||
|
|
||||||
AppUtil appUtil = new AppUtil();
|
@Override
|
||||||
List<FileDiffView> fileContentsArray = new ArrayList<>();
|
public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
|
||||||
|
|
||||||
String[] lines = response.body().string().split("diff");
|
if(response.code() == 200) {
|
||||||
|
|
||||||
if(lines.length > 0) {
|
try {
|
||||||
|
assert response.body() != null;
|
||||||
|
|
||||||
for (int i = 1; i < lines.length; i++) {
|
AppUtil appUtil = new AppUtil();
|
||||||
|
List<FileDiffView> fileContentsArray = new ArrayList<>();
|
||||||
|
|
||||||
if(lines[i].contains("@@ -")) {
|
String[] lines = response.body().string().split("diff");
|
||||||
|
|
||||||
String[] level2nd = lines[i].split("@@ -"); // main content part of single diff view
|
if(lines.length > 0) {
|
||||||
|
|
||||||
String[] fileName_ = level2nd[0].split("\\+\\+\\+ b/"); // filename part
|
for(int i = 1; i < lines.length; i++) {
|
||||||
String fileNameFinal = fileName_[1];
|
|
||||||
|
|
||||||
String[] fileContents_ = level2nd[1].split("@@"); // file info / content part
|
if(lines[i].contains("@@ -")) {
|
||||||
String fileInfoFinal = fileContents_[0];
|
|
||||||
StringBuilder fileContentsFinal = new StringBuilder(fileContents_[1]);
|
|
||||||
|
|
||||||
if(level2nd.length > 2) {
|
String[] level2nd = lines[i].split("@@ -"); // main content part of single diff view
|
||||||
for (int j = 2; j < level2nd.length; j++) {
|
|
||||||
fileContentsFinal.append(level2nd[j]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String fileExtension = FileUtils.getExtension(fileNameFinal);
|
String[] fileName_ = level2nd[0].split("\\+\\+\\+ b/"); // filename part
|
||||||
|
String fileNameFinal = fileName_[1];
|
||||||
|
|
||||||
String fileContentsFinalWithBlankLines = fileContentsFinal.toString().replaceAll( ".*@@.*", "" );
|
String[] fileContents_ = level2nd[1].split("@@"); // file info / content part
|
||||||
String fileContentsFinalWithoutBlankLines = fileContentsFinal.toString().replaceAll( ".*@@.*(\r?\n|\r)?", "" );
|
String fileInfoFinal = fileContents_[0];
|
||||||
fileContentsFinalWithoutBlankLines = fileContentsFinalWithoutBlankLines.replaceAll( ".*\\ No newline at end of file.*(\r?\n|\r)?", "" );
|
StringBuilder fileContentsFinal = new StringBuilder(fileContents_[1]);
|
||||||
|
|
||||||
fileContentsArray.add(new FileDiffView(fileNameFinal, appUtil.imageExtension(fileExtension), fileInfoFinal, fileContentsFinalWithoutBlankLines));
|
if(level2nd.length > 2) {
|
||||||
}
|
for(int j = 2; j < level2nd.length; j++) {
|
||||||
else {
|
fileContentsFinal.append(level2nd[j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String[] getFileName = lines[i].split("--git a/");
|
String fileExtension = FileUtils.getExtension(fileNameFinal);
|
||||||
|
|
||||||
String[] getFileName_ = getFileName[1].split("b/");
|
String fileContentsFinalWithBlankLines = fileContentsFinal.toString().replaceAll(".*@@.*", "");
|
||||||
String getFileNameFinal = getFileName_[0].trim();
|
String fileContentsFinalWithoutBlankLines = fileContentsFinal.toString().replaceAll(".*@@.*(\r?\n|\r)?", "");
|
||||||
|
fileContentsFinalWithoutBlankLines = fileContentsFinalWithoutBlankLines.replaceAll(".*\\ No newline at end of file.*(\r?\n|\r)?", "");
|
||||||
|
|
||||||
String[] binaryFile = getFileName_[1].split("GIT binary patch");
|
fileContentsArray.add(new FileDiffView(fileNameFinal, appUtil.imageExtension(fileExtension), fileInfoFinal, fileContentsFinalWithoutBlankLines));
|
||||||
String binaryFileRaw = binaryFile[1].substring(binaryFile[1].indexOf('\n')+1);
|
}
|
||||||
String binaryFileFinal = binaryFile[1].substring(binaryFileRaw.indexOf('\n')+1);
|
else {
|
||||||
|
|
||||||
String fileExtension = FileUtils.getExtension(getFileNameFinal);
|
String[] getFileName = lines[i].split("--git a/");
|
||||||
|
|
||||||
if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
|
String[] getFileName_ = getFileName[1].split("b/");
|
||||||
|
String getFileNameFinal = getFileName_[0].trim();
|
||||||
|
|
||||||
fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
|
String[] binaryFile = getFileName_[1].split("GIT binary patch");
|
||||||
}
|
String binaryFileRaw = binaryFile[1].substring(binaryFile[1].indexOf('\n') + 1);
|
||||||
|
String binaryFileFinal = binaryFile[1].substring(binaryFileRaw.indexOf('\n') + 1);
|
||||||
|
|
||||||
}
|
String fileExtension = FileUtils.getExtension(getFileNameFinal);
|
||||||
|
|
||||||
}
|
if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
|
||||||
|
|
||||||
}
|
fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
|
||||||
|
}
|
||||||
|
|
||||||
int filesCount = fileContentsArray.size();
|
}
|
||||||
if(filesCount > 1) {
|
|
||||||
toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
|
|
||||||
}
|
|
||||||
|
|
||||||
FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
|
}
|
||||||
mListView.setAdapter(adapter);
|
|
||||||
|
|
||||||
mProgressBar.setVisibility(View.GONE);
|
}
|
||||||
|
|
||||||
} catch (IOException e) {
|
int filesCount = fileContentsArray.size();
|
||||||
e.printStackTrace();
|
if(filesCount > 1) {
|
||||||
}
|
toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
|
||||||
else if(response.code() == 401) {
|
mListView.setAdapter(adapter);
|
||||||
|
|
||||||
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
|
mProgressBar.setVisibility(View.GONE);
|
||||||
getResources().getString(R.string.alertDialogTokenRevokedMessage),
|
|
||||||
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
|
|
||||||
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else if(response.code() == 403) {
|
catch(IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
Toasty.info(ctx, ctx.getString(R.string.authorizeError));
|
}
|
||||||
|
else if(response.code() == 401) {
|
||||||
|
|
||||||
}
|
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
|
||||||
else if(response.code() == 404) {
|
|
||||||
|
|
||||||
Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
|
}
|
||||||
|
else if(response.code() == 403) {
|
||||||
|
|
||||||
}
|
Toasty.info(ctx, ctx.getString(R.string.authorizeError));
|
||||||
else {
|
|
||||||
|
|
||||||
Toasty.info(ctx, getString(R.string.labelGeneralError));
|
}
|
||||||
|
else if(response.code() == 404) {
|
||||||
|
|
||||||
}
|
Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
@Override
|
Toasty.info(ctx, getString(R.string.labelGeneralError));
|
||||||
public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
|
|
||||||
Log.e("onFailure", t.toString());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initCloseListener() {
|
}
|
||||||
onClickListener = new View.OnClickListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
|
||||||
getIntent().removeExtra("singleFileName");
|
|
||||||
finish();
|
Log.e("onFailure", t.toString());
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
}
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initCloseListener() {
|
||||||
|
|
||||||
|
onClickListener = new View.OnClickListener() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onClick(View view) {
|
||||||
|
|
||||||
|
getIntent().removeExtra("singleFileName");
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,10 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
mergePullRequest.setVisibility(View.VISIBLE);
|
mergePullRequest.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(tinyDB.getString("repoType").equals("public")) {
|
if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.13.0")) {
|
||||||
|
openFilesDiff.setVisibility(View.VISIBLE);
|
||||||
|
}
|
||||||
|
else if(tinyDB.getString("repoType").equals("public")) {
|
||||||
openFilesDiff.setVisibility(View.VISIBLE);
|
openFilesDiff.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
||||||
|
|
@ -267,6 +267,9 @@ public interface ApiInterface {
|
||||||
@GET("repos/{owner}/{repo}/pulls") // get repository pull requests
|
@GET("repos/{owner}/{repo}/pulls") // get repository pull requests
|
||||||
Call<List<PullRequests>> getPullRequests(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String state, @Query("limit") int limit);
|
Call<List<PullRequests>> getPullRequests(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String state, @Query("limit") int limit);
|
||||||
|
|
||||||
|
@GET("repos/{owner}/{repo}/pulls/{index}.diff") // get pull diff file contents
|
||||||
|
Call<ResponseBody> getPullDiffContent(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Path("index") String pullIndex);
|
||||||
|
|
||||||
@POST("repos/{owner}/{repo}/pulls/{index}/merge") // merge a pull request
|
@POST("repos/{owner}/{repo}/pulls/{index}/merge") // merge a pull request
|
||||||
Call<ResponseBody> mergePullRequest(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body MergePullRequest jsonStr);
|
Call<ResponseBody> mergePullRequest(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body MergePullRequest jsonStr);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue