Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

BaseGitActivity: always enforce absolute URLs #788

Merged
merged 1 commit into from
May 24, 2020
Merged

BaseGitActivity: always enforce absolute URLs #788

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ abstract class BaseGitActivity : AppCompatActivity() {
val portPart =
if (serverPort == "22" || serverPort.isEmpty()) "" else ":$serverPort"
if (portPart.isEmpty()) {
// We only support relative paths with the standard port.
val pathPart = serverPath.trimStart('/', ':')
"$userPart$hostnamePart:$pathPart"
"$userPart$hostnamePart:$serverPath"
} else {
// Only absolute paths are supported with custom ports.
if (!serverPath.startsWith('/'))
Expand Down