-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jp/CCCT-469-HQ-user-invite-connectId' into ccct-467-wit…
…h-ccct-469
- Loading branch information
Showing
7 changed files
with
339 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:id="@+id/main" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| tools:context="org.commcare.activities.connect.HQUserInviteActivity"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/imageView2" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginHorizontal="30dp" | ||
| android:adjustViewBounds="true" | ||
| android:src="@drawable/commcare_logo" | ||
| app:layout_constraintBottom_toTopOf="@+id/guideline3" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" /> | ||
|
|
||
| <org.commcare.views.connect.connecttextview.ConnectMediumTextView | ||
| android:id="@+id/tvHqInvitationHeaderTitle" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginHorizontal="30dp" | ||
| android:layout_marginTop="20dp" | ||
| android:gravity="center" | ||
| android:text="" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/imageView2" /> | ||
|
|
||
| <org.commcare.views.connect.RoundedButton | ||
| android:id="@+id/btn_accept_invitation" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="40dp" | ||
| android:layout_marginHorizontal="50dp" | ||
| android:layout_marginTop="30dp" | ||
| android:text="@string/connect_hq_invitation_accept" | ||
| android:visibility="visible" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/tvHqInvitationHeaderTitle" | ||
| app:roundButtonBackgroundColor="@color/connect_blue_color" | ||
| app:roundButtonTextColor="@color/white" | ||
| app:roundButtonTextSize="6sp" | ||
| tools:text="@string/connect_hq_invitation_accept" /> | ||
|
|
||
| <org.commcare.views.connect.RoundedButton | ||
| android:id="@+id/btn_denied_invitation" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="40dp" | ||
| android:layout_marginHorizontal="50dp" | ||
| android:layout_marginTop="15dp" | ||
| android:text="@string/connect_hq_invitation_denied" | ||
| android:visibility="visible" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/btn_accept_invitation" | ||
| app:roundButtonBackgroundColor="@color/connect_blue_color" | ||
| app:roundButtonTextColor="@color/white" | ||
| app:roundButtonTextSize="6sp" | ||
| tools:text="@string/connect_hq_invitation_denied" /> | ||
|
|
||
| <org.commcare.views.connect.RoundedButton | ||
| android:id="@+id/btn_go_to_recovery" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="40dp" | ||
| android:layout_marginHorizontal="50dp" | ||
| android:layout_marginTop="15dp" | ||
| android:text="@string/connect_hq_invitation_go_to_recovery" | ||
| android:visibility="visible" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/btn_denied_invitation" | ||
| app:roundButtonBackgroundColor="@color/connect_blue_color" | ||
| app:roundButtonTextColor="@color/white" | ||
| app:roundButtonTextSize="6sp" | ||
| tools:text="@string/connect_hq_invitation_go_to_recovery" /> | ||
|
|
||
| <org.commcare.views.connect.connecttextview.ConnectMediumTextView | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:text="" | ||
| android:id="@+id/connect_phone_verify_error" | ||
| android:textSize="16sp" | ||
| android:layout_marginTop="10dp" | ||
| android:textColor="@color/connect_red" | ||
| app:layout_constraintEnd_toEndOf="@+id/btn_denied_invitation" | ||
| app:layout_constraintStart_toStartOf="@+id/btn_denied_invitation" | ||
| app:layout_constraintTop_toBottomOf="@+id/btn_denied_invitation" /> | ||
|
|
||
| <androidx.constraintlayout.widget.Guideline | ||
| android:id="@+id/guideline3" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="horizontal" | ||
| app:layout_constraintGuide_percent="0.35" /> | ||
|
|
||
| <ProgressBar | ||
| android:id="@+id/progress_bar" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| style="?android:attr/progressBarStyle" | ||
| android:layout_centerHorizontal="true" | ||
| android:progressTint="@color/connect_blue_color" | ||
| android:progressBackgroundTint="@color/connect_blue_color" | ||
| android:visibility="gone" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/btn_go_to_recovery" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
169 changes: 169 additions & 0 deletions
169
app/src/org/commcare/activities/connect/HQUserInviteActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| package org.commcare.activities.connect; | ||
|
|
||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
| import android.os.Bundle; | ||
| import android.util.Log; | ||
| import android.view.View; | ||
| import android.widget.Toast; | ||
|
|
||
| import org.commcare.activities.CommCareActivity; | ||
| import org.commcare.activities.DispatchActivity; | ||
| import org.commcare.android.database.connect.models.ConnectUserRecord; | ||
| import org.commcare.connect.ConnectManager; | ||
| import org.commcare.connect.network.ApiConnectId; | ||
| import org.commcare.connect.network.IApiCallback; | ||
| import org.commcare.dalvik.R; | ||
| import org.commcare.dalvik.databinding.ActivityHquserInviteBinding; | ||
| import org.javarosa.core.io.StreamsUtil; | ||
| import org.javarosa.core.services.Logger; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.Locale; | ||
|
|
||
| public class HQUserInviteActivity extends CommCareActivity<HQUserInviteActivity> { | ||
|
|
||
| private ActivityHquserInviteBinding binding; | ||
| String domain; | ||
| String inviteCode; | ||
| String username; | ||
| String callBackURL; | ||
| String connectUserName; | ||
| boolean isProgressVisible = false; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| binding = ActivityHquserInviteBinding.inflate(getLayoutInflater()); | ||
| setContentView(binding.getRoot()); | ||
| Intent intent = getIntent(); | ||
| Uri data = intent.getData(); | ||
| if (data != null) { | ||
| callBackURL = data.getQueryParameter("callback_url"); | ||
| username = data.getQueryParameter("hq_username"); | ||
| inviteCode = data.getQueryParameter("invite_code"); | ||
| domain = data.getQueryParameter("hq_domain"); | ||
| connectUserName = data.getQueryParameter("connect_username"); | ||
| } | ||
| handleButtons(); | ||
| } | ||
|
|
||
| private void handleButtons() { | ||
| ConnectManager.init(this); | ||
|
|
||
| ConnectUserRecord user = ConnectManager.getUser(this); | ||
| boolean isTokenPresent = ConnectManager.isConnectIdConfigured(); | ||
| boolean isCorrectUser = true; | ||
| if (user != null) { | ||
| isCorrectUser = user.getUserId().equals(connectUserName); | ||
| } | ||
|
|
||
| if (isCorrectUser) { | ||
| binding.tvHqInvitationHeaderTitle.setText(isTokenPresent | ||
| ? getString(R.string.connect_hq_invitation_heading, username) | ||
| : getString(R.string.connect_hq_invitation_connectId_not_configure)); | ||
| setButtonVisibility(isTokenPresent); | ||
| setButtonListeners(isTokenPresent); | ||
| } else { | ||
| binding.tvHqInvitationHeaderTitle.setText(getString(R.string.connect_hq_invitation_wrong_user)); | ||
| hideInvitationButtons(); | ||
| } | ||
| } | ||
|
|
||
| private void setButtonVisibility(boolean isTokenPresent) { | ||
| binding.btnAcceptInvitation.setVisibility(isTokenPresent ? View.VISIBLE : View.GONE); | ||
| binding.btnDeniedInvitation.setVisibility(isTokenPresent ? View.VISIBLE : View.GONE); | ||
| binding.btnGoToRecovery.setVisibility(isTokenPresent ? View.GONE : View.VISIBLE); | ||
| } | ||
|
|
||
| private void hideInvitationButtons() { | ||
| binding.btnAcceptInvitation.setVisibility(View.GONE); | ||
| binding.btnDeniedInvitation.setVisibility(View.GONE); | ||
| binding.btnGoToRecovery.setVisibility(View.GONE); | ||
| } | ||
|
|
||
| private void setButtonListeners(boolean isTokenPresent) { | ||
| if (isTokenPresent) { | ||
| binding.btnAcceptInvitation.setOnClickListener(view -> handleInvitation(callBackURL, inviteCode)); | ||
| binding.btnDeniedInvitation.setOnClickListener(view -> finish()); | ||
| } else { | ||
| binding.btnGoToRecovery.setOnClickListener(view -> ConnectManager.registerUser(this, success -> { | ||
| if (success) { | ||
| ConnectManager.goToConnectJobsList(this); | ||
| } | ||
| }) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| private void handleInvitation(String callBackUrl, String inviteCode) { | ||
| IApiCallback callback = new IApiCallback() { | ||
| @Override | ||
| public void processSuccess(int responseCode, InputStream responseData) { | ||
| binding.progressBar.setVisibility(View.GONE); | ||
| try { | ||
| String responseAsString = new String(StreamsUtil.inputStreamToByteArray(responseData)); | ||
| if (responseAsString.length() > 0) { | ||
| startActivity(new Intent(HQUserInviteActivity.this, DispatchActivity.class)); | ||
| finish(); | ||
| } | ||
| } catch (IOException e) { | ||
| Logger.exception("Parsing return from OTP request", e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void processFailure(int responseCode, IOException e) { | ||
| binding.progressBar.setVisibility(View.GONE); | ||
| String message = ""; | ||
| if (responseCode > 0) { | ||
| message = String.format(Locale.getDefault(), "(%d)", responseCode); | ||
| } else if (e != null) { | ||
| message = e.toString(); | ||
| } | ||
| setErrorMessage("Error requesting SMS code" + message); | ||
| } | ||
|
|
||
| @Override | ||
| public void processNetworkFailure() { | ||
| binding.progressBar.setVisibility(View.GONE); | ||
| setErrorMessage(getString(R.string.recovery_network_unavailable)); | ||
| } | ||
|
|
||
| @Override | ||
| public void processOldApiError() { | ||
| binding.progressBar.setVisibility(View.GONE); | ||
| setErrorMessage(getString(R.string.recovery_network_outdated)); | ||
| } | ||
| }; | ||
| ConnectUserRecord user = ConnectManager.getUser(this); | ||
| binding.progressBar.setVisibility(View.VISIBLE); | ||
| boolean isBusy = !ApiConnectId.hqUserInvitation(HQUserInviteActivity.this,user.getUserId(),user.getPassword(), callBackUrl, inviteCode, callback); | ||
| if (isBusy) { | ||
| Toast.makeText(HQUserInviteActivity.this, R.string.busy_message, Toast.LENGTH_SHORT).show(); | ||
| } | ||
| } | ||
|
|
||
| public void setErrorMessage(String message) { | ||
| if (message == null) { | ||
| binding.connectPhoneVerifyError.setVisibility(View.GONE); | ||
| } else { | ||
| binding.connectPhoneVerifyError.setVisibility(View.VISIBLE); | ||
| binding.connectPhoneVerifyError.setText(message); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDestroy() { | ||
| super.onDestroy(); | ||
| binding = null; | ||
| } | ||
|
|
||
| @Override | ||
| protected void onActivityResult(int requestCode, int resultCode, Intent data) { | ||
| super.onActivityResult(requestCode, resultCode, data); | ||
| finish(); | ||
| ConnectManager.handleFinishedActivity(this, requestCode, resultCode, data); | ||
| } | ||
| } |
Oops, something went wrong.