From 155deb7059e9c30fe4fb3106fe61aee5ea36b88c Mon Sep 17 00:00:00 2001
From: caleb <mail@caleb.dev>
Date: Tue, 3 Sep 2019 19:56:20 -0600
Subject: [PATCH] add styling and investigate data race condition

---
 .../res/layout/activity_configure_widget.xml  | 16 ----------------
 .../res/layout/newsblur_widget_item.xml       |  2 ++
 .../res/xml/newsblur_appwidget_info.xml       |  2 +-
 .../src/com/newsblur/activity/NbActivity.java |  2 ++
 .../newsblur/database/BlurDatabaseHelper.java |  3 +++
 .../com/newsblur/service/NBSyncService.java   |  3 +++
 .../widget/BlurWidgetRemoteViewsService.java  | 16 ++++++++++++----
 .../widget/ConfigureWidgetActivity.java       | 19 +++----------------
 8 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/clients/android/NewsBlur/res/layout/activity_configure_widget.xml b/clients/android/NewsBlur/res/layout/activity_configure_widget.xml
index 093541eca..1c1afa844 100644
--- a/clients/android/NewsBlur/res/layout/activity_configure_widget.xml
+++ b/clients/android/NewsBlur/res/layout/activity_configure_widget.xml
@@ -2,20 +2,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
-
-    <TextView
-        android:text="@string/select_feed"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <Button
-        android:text="@string/select_feed"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/btn_select" />
-    <Button
-        android:text="@string/save_widget"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/btn_save" />
 </LinearLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/newsblur_widget_item.xml b/clients/android/NewsBlur/res/layout/newsblur_widget_item.xml
index 6bbec59d8..ac08332c6 100644
--- a/clients/android/NewsBlur/res/layout/newsblur_widget_item.xml
+++ b/clients/android/NewsBlur/res/layout/newsblur_widget_item.xml
@@ -7,6 +7,8 @@
         android:id="@+id/newsblur_widget_item_title"
         android:paddingBottom="7dp"
         android:paddingTop="7dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:ellipsize="end"
         android:lines="1"
         android:textSize="14sp"
diff --git a/clients/android/NewsBlur/res/xml/newsblur_appwidget_info.xml b/clients/android/NewsBlur/res/xml/newsblur_appwidget_info.xml
index 350f45e1a..d47161393 100644
--- a/clients/android/NewsBlur/res/xml/newsblur_appwidget_info.xml
+++ b/clients/android/NewsBlur/res/xml/newsblur_appwidget_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="40dp"
+    android:minWidth="130dp"
     android:minHeight="40dp"
     android:updatePeriodMillis="86400000"
     android:initialLayout="@layout/newsblur_widget"
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java b/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
index ac926a999..5280a7e60 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
@@ -1,9 +1,11 @@
 package com.newsblur.activity;
 
+import android.appwidget.AppWidgetManager;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.widget.Toast;
 
+import com.newsblur.R;
 import com.newsblur.util.FeedUtils;
 import com.newsblur.util.PrefsUtils;
 import com.newsblur.util.PrefConstants.ThemeValue;
diff --git a/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java b/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
index 43cbf1b5d..68ead3a1c 100644
--- a/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
+++ b/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
@@ -1122,6 +1122,9 @@ public class BlurDatabaseHelper {
         q.append(DatabaseConstants.STORY_FEED_ID);
         q.append(" = ");
         q.append(fs.getSingleFeed());
+        q.append(" ORDER BY ");
+        q.append(DatabaseConstants.STORY_TIMESTAMP);
+        q.append(" DESC LIMIT 10");
         return rawQuery(q.toString(), null, cancellationSignal);
     }
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
index 0582a607f..e7e839970 100644
--- a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
+++ b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
@@ -3,6 +3,8 @@ package com.newsblur.service;
 import android.app.Service;
 import android.app.job.JobParameters;
 import android.app.job.JobService;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -37,6 +39,7 @@ import com.newsblur.util.ReadingAction;
 import com.newsblur.util.ReadFilter;
 import com.newsblur.util.StateFilter;
 import com.newsblur.util.StoryOrder;
+import com.newsblur.widget.NewsBlurWidgetProvider;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/clients/android/NewsBlur/src/com/newsblur/widget/BlurWidgetRemoteViewsService.java b/clients/android/NewsBlur/src/com/newsblur/widget/BlurWidgetRemoteViewsService.java
index 53daa8e48..18b074b84 100644
--- a/clients/android/NewsBlur/src/com/newsblur/widget/BlurWidgetRemoteViewsService.java
+++ b/clients/android/NewsBlur/src/com/newsblur/widget/BlurWidgetRemoteViewsService.java
@@ -71,6 +71,9 @@ class BlurWidgetRemoteViewsFactory implements RemoteViewsService.RemoteViewsFact
     }
 
     private void setUpCursor(){
+        if (cursor != null && !cursor.isClosed()) {
+            cursor.close();
+        }
         cursor = null;
         Loader<Cursor> loader = FeedUtils.dbHelper.getStoriesLoader(fs);
         loader.registerListener(loader.getId(), new Loader.OnLoadCompleteListener<Cursor>() {
@@ -97,12 +100,16 @@ class BlurWidgetRemoteViewsFactory implements RemoteViewsService.RemoteViewsFact
             s.bindExternValues(cursor);
             loadedStories.add(s);
         }
+//        loadedStories.equals()
         storyItems.clear();
         storyItems.addAll(loadedStories);
         cursor.close();
 
-        AppWidgetManager.getInstance(context)
-                .notifyAppWidgetViewDataChanged(appWidgetId, R.id.widget_list);
+
+//            AppWidgetManager widgetManager = AppWidgetManager.getInstance(this);
+//            int [] widgetIds = widgetManager.getAppWidgetIds(new ComponentName(this, NewsBlurWidgetProvider.class));
+//            widgetManager.notifyAppWidgetViewDataChanged(widgetIds, R.id.widget_list);
+
     }
     /**
      * allowed to run synchronous calls
@@ -176,7 +183,8 @@ class BlurWidgetRemoteViewsFactory implements RemoteViewsService.RemoteViewsFact
     @Override
     public void onDataSetChanged() {
         // fetch any new data
-        loadStories(10);
+//        loadStories(10);
+        setUpCursor();
         Log.d(TAG, "onDataSetChanged");
     }
 
@@ -196,7 +204,7 @@ class BlurWidgetRemoteViewsFactory implements RemoteViewsService.RemoteViewsFact
      */
     @Override
     public int getCount() {
-        Log.d(TAG, "getCount");
+        Log.d(TAG, "getCount: " + Math.min(storyItems.size(), 10));
         return Math.min(storyItems.size(), 10);
     }
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/widget/ConfigureWidgetActivity.java b/clients/android/NewsBlur/src/com/newsblur/widget/ConfigureWidgetActivity.java
index 1aba91907..7d4c6220c 100644
--- a/clients/android/NewsBlur/src/com/newsblur/widget/ConfigureWidgetActivity.java
+++ b/clients/android/NewsBlur/src/com/newsblur/widget/ConfigureWidgetActivity.java
@@ -39,7 +39,7 @@ public class ConfigureWidgetActivity extends NbActivity {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.activity_configure_widget);
-
+        PrefsUtils.applyThemePreference(this);
         Intent intent = getIntent();
         Bundle extras = intent.getExtras();
         if (extras != null) {
@@ -49,21 +49,7 @@ public class ConfigureWidgetActivity extends NbActivity {
         }
 
 
-        Button btnSelect = findViewById(R.id.btn_select);
-        btnSelect.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getAllFeeds();
-            }
-        });
-        Button btnSaveWidget = findViewById(R.id.btn_save);
-        btnSaveWidget.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                saveWidget();
-            }
-        });
-
+        getAllFeeds();
         // set result as cancelled in the case that we don't finish config
         Intent resultValue = new Intent();
         resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
@@ -106,6 +92,7 @@ public class ConfigureWidgetActivity extends NbActivity {
                     public void onClick(DialogInterface dialog, int which) {
                         Log.d(TAG, "Clicked " + which);
                         selectedFeed = feeds.get(which);
+                        saveWidget();
                     }
                 });
         builder.create().show();