Skip to content
Closed
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 @@ -176,6 +176,9 @@ public void refreshView() {
}

public void updateConnectProgress() {
if (viewJobCard == null) {
return;
}
Comment on lines +179 to +181
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if instantiate here and show the job card details?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intialized it here

RecyclerView recyclerView = viewJobCard.findViewById(R.id.rdDeliveryTypeList);
ConnectJobRecord job = ConnectJobHelper.INSTANCE.getActiveJob();

Expand Down
18 changes: 9 additions & 9 deletions app/src/org/commcare/activities/connect/ConnectActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {

if (getIntent().getBooleanExtra("info", false)) {
ConnectJobRecord job = ConnectJobHelper.INSTANCE.getActiveJob();
Objects.requireNonNull(job);

startDestinationId = job.getStatus() == ConnectJobRecord.STATUS_DELIVERING
? R.id.connect_job_delivery_progress_fragment
: R.id.connect_job_learning_progress_fragment;

boolean buttons = getIntent().getBooleanExtra("buttons", true);
startArgs = new Bundle();
startArgs.putBoolean("showLaunch", buttons);
if (job != null) {
startDestinationId = job.getStatus() == ConnectJobRecord.STATUS_DELIVERING
? R.id.connect_job_delivery_progress_fragment
: R.id.connect_job_learning_progress_fragment;

boolean buttons = getIntent().getBooleanExtra("buttons", true);
startArgs = new Bundle();
startArgs.putBoolean("showLaunch", buttons);
}
Comment on lines -84 to +92
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these changes should not be part of this PR


} else if (!Strings.isNullOrEmpty(redirectionAction)) {
Logger.log("ConnectActivity", "Redirecting to unlock fragment");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@ public static void showOutdatedApiError(Context context) {
}

public static void handleTokenUnavailableException(Context context) {
if (context == null) {
return;
}
Comment on lines +433 to +435
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, please remove for this PR.

Toast.makeText(context, context.getString(R.string.recovery_network_token_unavailable),
Toast.LENGTH_LONG).show();
}
Expand Down