Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import com.google.gson.reflect.TypeToken;
import com.nextcloud.android.common.ui.color.ColorUtil;
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
import com.nextcloud.android.lib.resources.users.GenerateOneTimeAppPasswordRemoteOperation;
import com.nextcloud.client.account.User;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.device.DeviceInfo;
Expand All @@ -61,6 +62,7 @@
import com.nextcloud.client.onboarding.FirstRunActivity;
import com.nextcloud.client.onboarding.OnboardingService;
import com.nextcloud.client.preferences.AppPreferences;
import com.nextcloud.common.NextcloudClient;
import com.nextcloud.common.PlainClient;
import com.nextcloud.operations.PostMethod;
import com.nextcloud.utils.extensions.BundleExtensionsKt;
Expand Down Expand Up @@ -137,6 +139,7 @@
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.ProcessLifecycleOwner;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import okhttp3.Credentials;
import okhttp3.FormBody;
import okhttp3.RequestBody;

Expand Down Expand Up @@ -1594,7 +1597,36 @@ private void startQRScanner() {
accountManager.getAccounts().length == 1) {
DisplayUtils.showSnackMessage(this, R.string.no_mutliple_accounts_allowed);
} else {
parseAndLoginFromWebView(resultData);
String onetimePrefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "onetime-login/";

if (resultData.startsWith(onetimePrefix)) {
LoginUrlInfo loginUrlInfo = parseLoginDataUrl(onetimePrefix, resultData);

GenerateOneTimeAppPasswordRemoteOperation generateOneTimeAppPasswordRemoteOperation = new GenerateOneTimeAppPasswordRemoteOperation();

String credentials = Credentials.basic(loginUrlInfo.getLoginName(), loginUrlInfo.getAppPassword());
NextcloudClient nextcloudClient = new NextcloudClient(Uri.parse(loginUrlInfo.getServer()), loginUrlInfo.getLoginName(), credentials,this);

new Thread(new Runnable() {
@Override
public void run() {
RemoteOperationResult<String> otpResult = nextcloudClient.execute(generateOneTimeAppPasswordRemoteOperation);

mServerInfo.mBaseUrl = AuthenticatorUrlUtils.INSTANCE.normalizeUrlSuffix(loginUrlInfo.getServer());
webViewUser = loginUrlInfo.getLoginName();
webViewPassword = otpResult.getResultData();

runOnUiThread(new Runnable() {
@Override
public void run() {
checkOcServer();
}
});
}
}).start();
} else {
parseAndLoginFromWebView(resultData);
}
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
androidCommonLibraryVersion = "0.30.0"
androidGifDrawableVersion = "1.2.29"
androidImageCropperVersion = "4.7.0"
androidLibraryVersion = "827db94ca661d39ca7fae5c608eab1282b629b84"
androidLibraryVersion = "d5cb052be9ebf363547f2cda87d81d238fe6bf3b"
androidPluginVersion = '8.13.2'
androidsvgVersion = "1.4"
androidxMediaVersion = "1.5.1"
Expand Down
Loading