Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BillCarsonFr committed Sep 24, 2019
1 parent 85901fb commit a4051f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions vector/src/main/java/im/vector/activity/LoginActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.transition.TransitionManager;

import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;

import org.jetbrains.annotations.Nullable;
import org.matrix.androidsdk.HomeServerConnectionConfig;
import org.matrix.androidsdk.MXSession;
import org.matrix.androidsdk.core.JsonUtils;
Expand Down Expand Up @@ -1292,8 +1292,7 @@ public void onSuccess(Boolean info) {

private void doForgetPasswordRequest(HomeServerConnectionConfig hsConfig, String email, @Nullable String identityServerHost) {
ProfileRestClient pRest = new ProfileRestClient(hsConfig);

pRest.forgetPassword(email, new ApiCallback<ThreePid>() {
pRest.forgetPassword(hsConfig.getIdentityServerUri(), email, new ApiCallback<ThreePid>() {
@Override
public void onSuccess(ThreePid thirdPid) {
if (mMode == MODE_FORGOT_PASSWORD) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ private void createRoom(final List<ParticipantAdapterItem> participants) {
}
}

boolean res = params.addParticipantIds(mSession.getHomeServerConfig(), ids);
boolean res = params.addParticipantIds(mSession.getIdentityServerManager().getIdentityServerUri(), mSession.getHomeServerConfig(), ids);

if (res) {
Toast.makeText(this, R.string.identity_server_not_defined, Toast.LENGTH_LONG).show();
Expand Down

0 comments on commit a4051f4

Please sign in to comment.