From 6736fa2f5d66ec3bbf07e95983a2dc023e8b2dfc Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sun, 26 Apr 2020 11:02:03 +0000 Subject: [PATCH] Fix repo url (#455) Fix repo url Co-authored-by: 6543 <6543@noreply.gitea.io> Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/455 Reviewed-by: opyale Reviewed-by: 6543 <6543@noreply.gitea.io> --- .../mian/gitnex/activities/RepoDetailActivity.java | 14 ++++---------- .../mian/gitnex/fragments/RepoInfoFragment.java | 2 ++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index 180fd31c..efb4b43f 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -292,12 +292,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF public void onButtonClicked(String text) { TinyDB tinyDb = new TinyDB(getApplicationContext()); - String repoFullName = tinyDb.getString("repoFullName"); - String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw"); - if(!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) { - instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol"); - } - Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullName); switch(text) { case "label": @@ -316,15 +310,15 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class)); break; case "openWebRepo": - Intent i = new Intent(Intent.ACTION_VIEW, url); + Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDb.getString("repoHtmlUrl"))); startActivity(i); break; case "shareRepo": Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND); sharingIntent.setType("text/plain"); - sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, url); - sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, url); - startActivity(Intent.createChooser(sharingIntent, url.toString())); + sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDb.getString("repoHtmlUrl")); + sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDb.getString("repoHtmlUrl")); + startActivity(Intent.createChooser(sharingIntent, tinyDb.getString("repoHtmlUrl"))); break; case "newFile": startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class)); diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java index 9f636f8a..deab7b03 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java @@ -317,6 +317,8 @@ public class RepoInfoFragment extends Fragment { tinyDb.putBoolean("hasIssues", true); } + tinyDb.putString("repoHtmlUrl", repoInfo.getHtml_url()); + mProgressBar.setVisibility(View.GONE); pageContent.setVisibility(View.VISIBLE);