Skip to content

Fixed loading message not disappearing when the note is loaded #3321

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

Open
daniele-verducci wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −22
Open

Fixed loading message not disappearing when the note is loaded #3321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ class SingleNoteWidget : AppWidgetProvider() {
).apply {
setPendingIntentTemplate(R.id.single_note_widget_lv, pendingIntent)
setRemoteAdapter(R.id.single_note_widget_lv, serviceIntent)
setViewVisibility(R.id.widget_single_note_placeholder_tv, View.VISIBLE)
setTextViewText(R.id.widget_single_note_placeholder_tv, context.getString(R.string.widget_single_note_loading))
}
}

Expand Down
43 changes: 26 additions & 17 deletions ...src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,33 @@ public void onCreate() {
@Override
public void onDataSetChanged() {
final var data = repo.getSingleNoteWidgetData(appWidgetId);
if (data != null) {
final long noteId = data.getNoteId();
Log.v(TAG, "Fetch note with id " + noteId);
note = repo.getNoteById(noteId);

final var views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note);
if (note == null) {
Log.e(TAG, "Error: note not found");
views.setViewVisibility(R.id.widget_single_note_placeholder_tv, View.VISIBLE);
views.setTextViewText(R.id.widget_single_note_placeholder_tv,
context.getString(R.string.widget_single_note_note_not_found));
} else {
views.setViewVisibility(R.id.widget_single_note_placeholder_tv, View.GONE);
}
AppWidgetManager.getInstance(context).partiallyUpdateAppWidget(appWidgetId, views);
} else {
Log.w(TAG, "Widget with ID " + appWidgetId + " seems to be not configured yet.");
final var views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note);
if (data == null) {
showErrorView(context, views);
return;
}

final long noteId = data.getNoteId();
note = repo.getNoteById(noteId);
Log.v(TAG, "Fetch note with id " + noteId);

if (note == null) {
showErrorView(context, views);
Log.e(TAG, "Error: note not found");
return;
}
views.setViewVisibility(R.id.widget_single_note_placeholder_tv, View.GONE);

AppWidgetManager.getInstance(context).partiallyUpdateAppWidget(appWidgetId, views);
}

private void showErrorView(Context context, RemoteViews views) {
views.setViewVisibility(R.id.single_note_widget_lv, View.GONE);
views.setViewVisibility(R.id.widget_single_note_placeholder_tv, View.VISIBLE);
views.setTextViewText(R.id.widget_single_note_placeholder_tv,
context.getString(R.string.widget_single_note_note_not_found));

AppWidgetManager.getInstance(context).partiallyUpdateAppWidget(appWidgetId, views);
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/layout/widget_single_note.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
android:layout_height="match_parent"
android:gravity="center"
android:padding="@dimen/spacer_1x"
android:text="@string/widget_single_note_note_not_found"
android:text="@string/widget_single_note_loading"
android:textAlignment="center"
android:textColor="@color/widget_foreground"
android:visibility="gone" />
android:textColor="@color/widget_foreground" />

</RelativeLayout>
Loading