diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index 9974ad53..2ccd58be 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -194,16 +194,20 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList instanceHost = instanceUrl; } + String instanceUrlWithProtocol; if(protocol.toLowerCase().equals("https")) { instanceUrl = "https://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "https://" + instanceHost; } else { instanceUrl = "http://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "https://" + instanceHost; } tinyDb.putString("instanceUrlRaw", instanceHost); tinyDb.putString("loginUid", loginUid); tinyDb.putString("instanceUrl", instanceUrl); + tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol); if(connToInternet) { diff --git a/app/src/main/java/org/mian/gitnex/activities/OpenWebRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/OpenWebRepoActivity.java deleted file mode 100644 index 3a431379..00000000 --- a/app/src/main/java/org/mian/gitnex/activities/OpenWebRepoActivity.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.mian.gitnex.activities; - -import androidx.appcompat.app.AppCompatActivity; - -/** - * Author 6543 - */ - -import android.view.View; -import org.mian.gitnex.util.TinyDB; -import android.content.Intent; -import android.net.Uri; - - -public class OpenWebRepoActivity extends AppCompatActivity implements View.OnClickListener { - - @Override - public void onClick(View v) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); - String repoFullName = tinyDb.getString("repoFullName"); - String instanceUrl = tinyDb.getString("instanceUrl"); - - String url = instanceUrl + "/" + repoFullName; - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - startActivity(i); - - } -} \ No newline at end of file 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 0a42adcd..c0003bc8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -35,6 +35,7 @@ import org.mian.gitnex.models.UserRepositories; import org.mian.gitnex.util.AppUtil; import org.mian.gitnex.util.TinyDB; import java.util.Objects; +import android.net.Uri; /** * Author M M Arif @@ -153,6 +154,17 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS case "createRelease": startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class)); break; + case "openWebRepo": + 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); + Intent i = new Intent(Intent.ACTION_VIEW, url); + startActivity(i); + break; } }