Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat (OONI Run v2): Add support for updated badge #727

Merged
merged 2 commits into from
May 20, 2024
Merged

feat (OONI Run v2): Add support for updated badge #727

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c7c8c
feat (OONI Run v2): Add support for updated badge
aanorbel May 8, 2024
b1e950f
chore: add `OONI_API_BASE_URL` to stable flavor
aanorbel May 20, 2024
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
Next Next commit
feat (OONI Run v2): Add support for updated badge
  • Loading branch information
@aanorbel
aanorbel committed May 8, 2024
commit 04c7c8ce68bb5ccea321b604df4cb3e5096389ae
65 changes: 36 additions & 29 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.google.android.material.snackbar.Snackbar;

import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.activity.reviewdescriptorupdates.AvailableUpdatesViewModel;
import org.openobservatory.ooniprobe.activity.reviewdescriptorupdates.ReviewDescriptorUpdatesActivity;
import org.openobservatory.ooniprobe.common.Application;
import org.openobservatory.ooniprobe.common.NotificationUtility;
Expand Down Expand Up @@ -75,6 +76,9 @@ public class MainActivity extends ReviewUpdatesAbstractActivity implements Confi
@Inject
TestDescriptorManager descriptorManager;

@Inject
AvailableUpdatesViewModel updatesViewModel;

private ActivityResultLauncher<String> requestPermissionLauncher;

public static Intent newIntent(Context context, int resItem) {
Expand Down Expand Up @@ -213,7 +217,7 @@ public void fetchManualUpdate() {
*/
private void onManualUpdatesFetchComplete(WorkInfo workInfo) {
if (workInfo != null) {
if (workInfo.getProgress().getInt(PROGRESS,-1) >= 0) {
if (workInfo.getProgress().getInt(PROGRESS, -1) >= 0) {
binding.reviewUpdateNotificationFragment.setVisibility(View.VISIBLE);
}
switch (workInfo.getState()) {
Expand All @@ -224,29 +228,32 @@ private void onManualUpdatesFetchComplete(WorkInfo workInfo) {
return;
}
getSupportFragmentManager()
.beginTransaction()
.add(
R.id.review_update_notification_fragment,
OONIRunDynamicProgressBar.newInstance(ProgressType.REVIEW_LINK, new OnActionListener() {
@Override
public void onActionButtonCLicked() {

getReviewUpdatesLauncher().launch(
ReviewDescriptorUpdatesActivity.newIntent(
MainActivity.this,
descriptor
)
);
removeProgressFragment(R.id.review_update_notification_fragment);
}

@Override
public void onCloseButtonClicked() {
removeProgressFragment(R.id.review_update_notification_fragment);
}
}),
OONIRunDynamicProgressBar.getTAG() + "_review_update_success_notification"
).commit();
.beginTransaction()
.add(
R.id.review_update_notification_fragment,
OONIRunDynamicProgressBar.newInstance(ProgressType.REVIEW_LINK, new OnActionListener() {
@Override
public void onActionButtonCLicked() {

getReviewUpdatesLauncher().launch(
ReviewDescriptorUpdatesActivity.newIntent(
MainActivity.this,
descriptor,
true
)
);
removeProgressFragment(R.id.review_update_notification_fragment);
}

@Override
public void onCloseButtonClicked() {
updatesViewModel.setDescriptorsWith(descriptor);
//TODO: Add a method to reload the list of descriptors.
removeProgressFragment(R.id.review_update_notification_fragment);
}
}),
OONIRunDynamicProgressBar.getTAG() + "_review_update_success_notification"
).commit();
}

case ENQUEUED -> getSupportFragmentManager()
Expand Down Expand Up @@ -321,11 +328,11 @@ protected void onNewIntent(Intent intent) {
binding.bottomNavigation.setSelectedItemId(intent.getIntExtra(RES_ITEM, R.id.dashboard));
} else if (intent.getExtras().containsKey(NOTIFICATION_DIALOG)) {
new ConfirmDialogFragment.Builder()
.withTitle(intent.getExtras().getString("title"))
.withMessage(intent.getExtras().getString("message"))
.withNegativeButton("")
.withPositiveButton(getString(R.string.Modal_OK))
.build().show(getSupportFragmentManager(), null);
.withTitle(intent.getExtras().getString("title"))
.withMessage(intent.getExtras().getString("message"))
.withNegativeButton("")
.withPositiveButton(getString(R.string.Modal_OK))
.build().show(getSupportFragmentManager(), null);
}
}
}
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.openobservatory.ooniprobe.activity.overview.OverviewTestsExpandableListViewAdapter;
import org.openobservatory.ooniprobe.activity.overview.OverviewViewModel;
import org.openobservatory.ooniprobe.activity.overview.RevisionsFragment;
import org.openobservatory.ooniprobe.activity.reviewdescriptorupdates.AvailableUpdatesViewModel;
import org.openobservatory.ooniprobe.activity.reviewdescriptorupdates.ReviewDescriptorUpdatesActivity;
import org.openobservatory.ooniprobe.common.AbstractDescriptor;
import org.openobservatory.ooniprobe.common.OONITests;
Expand Down Expand Up @@ -67,6 +68,10 @@ public class OverviewActivity extends ReviewUpdatesAbstractActivity implements C
@Inject
OverviewViewModel viewModel;


@Inject
AvailableUpdatesViewModel updatesViewModel;

OverviewTestsExpandableListViewAdapter adapter;

private AbstractDescriptor<BaseNettest> descriptor;
Expand Down Expand Up @@ -112,6 +117,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
if (Boolean.TRUE.equals(testDescriptor.isExpired())) {
binding.expiredTag.getRoot().setVisibility(View.VISIBLE);
}

InstalledDescriptor installedDescriptor = ((InstalledDescriptor) descriptor);
if (installedDescriptor.isUpdateAvailable()) {
binding.updatedTag.getRoot().setVisibility(View.VISIBLE);


binding.reviewUpdates.setVisibility(View.VISIBLE);
binding.reviewUpdates.setOnClickListener(view -> getReviewUpdatesLauncher().launch(
ReviewDescriptorUpdatesActivity.newIntent(
OverviewActivity.this,
updatesViewModel.getUpdatedDescriptor(testDescriptor.getRunId())
)
));


}
} else {
markwon.setMarkdown(binding.desc, descriptor.getDescription());
}
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/org/openobservatory/ooniprobe/activity/adddescriptor/AddDescriptorActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ class AddDescriptorActivity : AbstractActivity() {
StringUtils.camelToSnake(
iconName
), "drawable", imageView.context.packageName
)
).let {
if (it == 0) R.drawable.ooni_empty_state else it
}
).apply {
color?.let {
imageView.setColorFilter(it)
Expand Down
23 changes: 23 additions & 0 deletions ...g/openobservatory/ooniprobe/activity/reviewdescriptorupdates/AvailableUpdatesViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.openobservatory.ooniprobe.activity.reviewdescriptorupdates

import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import com.google.gson.Gson
import org.openobservatory.ooniprobe.model.database.ITestDescriptor
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class AvailableUpdatesViewModel @Inject() constructor(var gson: Gson) : ViewModel() {
var descriptors: MutableLiveData<List<ITestDescriptor>> = MutableLiveData()
var descriptorString: MutableLiveData<String> = MutableLiveData()

fun setDescriptorsWith(descriptorJson: String) {
descriptorString.value = descriptorJson
descriptors.value = gson.fromJson(descriptorJson, Array<ITestDescriptor>::class.java).toList()
}

fun getUpdatedDescriptor(runId: Long): String {
return gson.toJson(arrayOf(descriptors.value?.find { it.runId == runId }))
}
}
Loading
Loading