Merge branch 'master' into 262-changelog-popup

This commit is contained in:
6543 2020-03-29 13:45:39 +00:00
commit 667d98329c

View File

@ -245,7 +245,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
else {
instanceUrl = "http://" + instanceHost + "/api/v1/";
instanceUrlWithProtocol = "https://" + instanceHost;
instanceUrlWithProtocol = "http://" + instanceHost;
}
tinyDb.putString("instanceUrlRaw", instanceHost);
@ -334,7 +334,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
else {
instanceUrl = "http://" + instanceHost + "/api/v1/";
instanceUrlWithProtocol = "https://" + instanceHost;
instanceUrlWithProtocol = "http://" + instanceHost;
}
tinyDb.putString("instanceUrlRaw", instanceHost);