Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6339c51 authored by Daniel Bailey's avatar Daniel Bailey Committed by Niedermann IT-Dienstleistungen
Browse files

onReceive and onUpdate super methods are called first instead of last.

parent 9d93a97a
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ public class NoteListWidget extends AppWidgetProvider {

    @Override
    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
        super.onUpdate(context, appWidgetManager, appWidgetIds);

        for (int appWidgetId : appWidgetIds) {
            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
@@ -62,7 +63,7 @@ public class NoteListWidget extends AppWidgetProvider {
                                                                0, templateIntent,
                                                                PendingIntent.FLAG_UPDATE_CURRENT);

            if (displayMode == 2) {
            if (displayMode == NLW_DISPLAY_CATEGORY) {
                serviceIntent.putExtra(NoteListWidget.WIDGET_CATEGORY_KEY + appWidgetId, category);
            }
            serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
@@ -71,12 +72,12 @@ public class NoteListWidget extends AppWidgetProvider {
            views.setEmptyView(R.id.note_list_widget_lv, R.id.widget_note_list_placeholder_tv);
            appWidgetManager.updateAppWidget(appWidgetId, views);
        }

        super.onUpdate(context, appWidgetManager, appWidgetIds);
    }

    @Override
    public void onReceive(Context context, Intent intent) {
        super.onReceive(context, intent);

        AppWidgetManager awm = AppWidgetManager.getInstance(context);
        int appWidgetIds[] = awm.getAppWidgetIds(new ComponentName(context, NoteListWidget.class));

@@ -85,8 +86,6 @@ public class NoteListWidget extends AppWidgetProvider {
                awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv);
            }
        }

        super.onReceive(context, intent);
    }

    @Override
+3 −6
Original line number Diff line number Diff line
@@ -39,17 +39,16 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
    public void onCreate() {
        db = NoteSQLiteOpenHelper.getInstance(context);
        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_note_list);
        AppWidgetManager awm = AppWidgetManager.getInstance(context);

        switch (displayMode)
        {
            case 0:
            case NoteListWidget.NLW_DISPLAY_ALL:
                views.setTextViewText(R.id.widget_note_list_title_tv, context.getString(R.string.app_name));
                break;
            case 1:
            case NoteListWidget.NLW_DISPLAY_STARRED:
                views.setTextViewText(R.id.widget_note_list_title_tv, "Starred");
                break;
            case 2:
            case NoteListWidget.NLW_DISPLAY_CATEGORY:
                category = sp.getString(NoteListWidget.WIDGET_CATEGORY_KEY + appWidgetId, null);
                if (category.equals("")) {
                    views.setTextViewText(R.id.widget_note_list_title_tv, context.getString(R.string.action_uncategorized));
@@ -58,8 +57,6 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
                }
                break;
        }

        awm.updateAppWidget(appWidgetId, views);
    }

    @Override
+17 −15
Original line number Diff line number Diff line
@@ -36,21 +36,6 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
        db = NoteSQLiteOpenHelper.getInstance(mContext);
    }

    @Override
    public boolean hasStableIds() {
        return true;
    }

    // TODO Set loading view
    @Override
    public RemoteViews getLoadingView() {
        return null;
    }

    @Override
    public int getViewTypeCount() {
        return 1;
    }

    @Override
    public void onDataSetChanged() {
@@ -107,8 +92,25 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
        return note_content;
    }


    // TODO Set loading view
    @Override
    public RemoteViews getLoadingView() {
        return null;
    }

    @Override
    public int getViewTypeCount() {
        return 1;
    }

    @Override
    public long getItemId(int position) {
        return position;
    }

    @Override
    public boolean hasStableIds() {
        return true;
    }
}