Global Refresh -> Keep Updated

app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java

@@ -66,7 +66,7 @@ public class FeedInfoActivity extends ActionBarActivity {
     private RadioButton rdoFilterInclude;
     private RadioButton rdoFilterExclude;
     private CheckBox cbxAutoDownload;
-    private CheckBox cbxGlobalRefresh;
+    private CheckBox cbxKeepUpdated;
     private Spinner spnAutoDelete;
     private boolean filterInclude = true;
 
@@ -106,7 +106,7 @@ public class FeedInfoActivity extends ActionBarActivity {
         txtvAuthor = (TextView) findViewById(R.id.txtvAuthor);
         txtvUrl = (TextView) findViewById(R.id.txtvUrl);
         cbxAutoDownload = (CheckBox) findViewById(R.id.cbxAutoDownload);
-        cbxGlobalRefresh = (CheckBox) findViewById(R.id.cbxGlobalRefresh);
+        cbxKeepUpdated = (CheckBox) findViewById(R.id.cbxKeepUpdated);
         spnAutoDelete = (Spinner) findViewById(R.id.spnAutoDelete);
         etxtUsername = (EditText) findViewById(R.id.etxtUsername);
         etxtPassword = (EditText) findViewById(R.id.etxtPassword);
@@ -177,9 +177,9 @@ public class FeedInfoActivity extends ActionBarActivity {
                                 feed, checked);
                         dialog.createNewDialog().show();
                     });
-                    cbxGlobalRefresh.setChecked(prefs.getGlobalRefresh());
+                    cbxKeepUpdated.setChecked(prefs.getKeepUpdated());
-                    cbxGlobalRefresh.setOnCheckedChangeListener((compoundButton, checked) -> {
+                    cbxKeepUpdated.setOnCheckedChangeListener((compoundButton, checked) -> {
-                        feed.getPreferences().setGlobalRefresh(checked);
+                        feed.getPreferences().setKeepUpdated(checked);
                         feed.savePreferences(FeedInfoActivity.this);
                     });
                     spnAutoDelete.setOnItemSelectedListener(new OnItemSelectedListener() {

app/src/main/res/layout/feedinfo.xml

@@ -182,11 +182,11 @@
             </android.support.v7.widget.GridLayout>
 
             <CheckBox
-                android:id="@+id/cbxGlobalRefresh"
+                android:id="@+id/cbxKeepUpdated"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:text="@string/global_refresh"
+                android:text="@string/keep_updated"
                 android:enabled="true"
                 android:textColor="?android:attr/textColorPrimary"
                 tools:background="@android:color/holo_red_light"

core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java

@@ -18,7 +18,7 @@ public class FeedPreferences {
     private FeedFilter filter;
     private long feedID;
     private boolean autoDownload;
-    private boolean globalRefresh;
+    private boolean keepUpdated;
 
     public enum AutoDeleteAction {
         GLOBAL,
@@ -33,10 +33,10 @@ public class FeedPreferences {
         this(feedID, autoDownload, true, auto_delete_action, username, password, new FeedFilter());
     }
 
-    public FeedPreferences(long feedID, boolean autoDownload, boolean globalRefresh, AutoDeleteAction auto_delete_action, String username, String password, @NonNull FeedFilter filter) {
+    public FeedPreferences(long feedID, boolean autoDownload, boolean keepUpdated, AutoDeleteAction auto_delete_action, String username, String password, @NonNull FeedFilter filter) {
         this.feedID = feedID;
         this.autoDownload = autoDownload;
-        this.globalRefresh = globalRefresh;
+        this.keepUpdated = keepUpdated;
         this.auto_delete_action = auto_delete_action;
         this.username = username;
         this.password = password;
@@ -46,7 +46,7 @@ public class FeedPreferences {
     public static FeedPreferences fromCursor(Cursor cursor) {
         int indexId = cursor.getColumnIndex(PodDBAdapter.KEY_ID);
         int indexAutoDownload = cursor.getColumnIndex(PodDBAdapter.KEY_AUTO_DOWNLOAD);
-        int indexAutoRefresh = cursor.getColumnIndex(PodDBAdapter.KEY_GLOBAL_REFRESH);
+        int indexAutoRefresh = cursor.getColumnIndex(PodDBAdapter.KEY_KEEP_UPDATED);
         int indexAutoDeleteAction = cursor.getColumnIndex(PodDBAdapter.KEY_AUTO_DELETE_ACTION);
         int indexUsername = cursor.getColumnIndex(PodDBAdapter.KEY_USERNAME);
         int indexPassword = cursor.getColumnIndex(PodDBAdapter.KEY_PASSWORD);
@@ -80,12 +80,12 @@ public class FeedPreferences {
      * @return true if this feed should be refreshed when everything else is being refreshed
      *         if false the feed should only be refreshed if requested directly.
      */
-    public boolean getGlobalRefresh() {
+    public boolean getKeepUpdated() {
-        return globalRefresh;
+        return keepUpdated;
     }
 
-    public void setGlobalRefresh(boolean globalRefresh) {
+    public void setKeepUpdated(boolean keepUpdated) {
-        this.globalRefresh = globalRefresh;
+        this.keepUpdated = keepUpdated;
     }
 
     /**

core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java

@@ -371,7 +371,7 @@ public final class DBReader {
 
     /**
      * Loads a list of FeedItems that are considered new.
-     * Excludes items from feeds that do not have global refresh enabled.
+     * Excludes items from feeds that do not have keep updated enabled.
      * @return A list of FeedItems that are considered new.
      */
     public static List<FeedItem> getNewItemsList() {

core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java

@@ -196,9 +196,9 @@ public final class DBTasks {
 
         for (Feed feed : feedList) {
             FeedPreferences prefs = feed.getPreferences();
-            // feeds with !getGlobalRefresh can only be refreshed
+            // feeds with !getKeepUpdated can only be refreshed
             // directly from the FeedActivity
-            if (prefs.getGlobalRefresh()) {
+            if (prefs.getKeepUpdated()) {
                 try {
                     refreshFeed(context, feed);
                 } catch (DownloadRequestException e) {

core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java

@@ -92,7 +92,7 @@ public class PodDBAdapter {
     public static final String KEY_CHAPTER_TYPE = "type";
     public static final String KEY_PLAYBACK_COMPLETION_DATE = "playback_completion_date";
     public static final String KEY_AUTO_DOWNLOAD = "auto_download";
-    public static final String KEY_GLOBAL_REFRESH = "global_refresh";
+    public static final String KEY_KEEP_UPDATED = "keep_updated";
     public static final String KEY_AUTO_DELETE_ACTION = "auto_delete_action";
     public static final String KEY_PLAYED_DURATION = "played_duration";
     public static final String KEY_USERNAME = "username";
@@ -133,7 +133,7 @@ public class PodDBAdapter {
             + KEY_PASSWORD + " TEXT,"
             + KEY_INCLUDE_FILTER + " TEXT DEFAULT '',"
             + KEY_EXCLUDE_FILTER + " TEXT DEFAULT '',"
-            + KEY_GLOBAL_REFRESH + " INTEGER DEFAULT 1,"
+            + KEY_KEEP_UPDATED + " INTEGER DEFAULT 1,"
             + KEY_IS_PAGED + " INTEGER DEFAULT 0,"
             + KEY_NEXT_PAGE_LINK + " TEXT,"
             + KEY_HIDE + " TEXT,"
@@ -236,7 +236,7 @@ public class PodDBAdapter {
             TABLE_NAME_FEEDS + "." + KEY_TYPE,
             TABLE_NAME_FEEDS + "." + KEY_FEED_IDENTIFIER,
             TABLE_NAME_FEEDS + "." + KEY_AUTO_DOWNLOAD,
-            TABLE_NAME_FEEDS + "." + KEY_GLOBAL_REFRESH,
+            TABLE_NAME_FEEDS + "." + KEY_KEEP_UPDATED,
             TABLE_NAME_FEEDS + "." + KEY_FLATTR_STATUS,
             TABLE_NAME_FEEDS + "." + KEY_IS_PAGED,
             TABLE_NAME_FEEDS + "." + KEY_NEXT_PAGE_LINK,
@@ -401,7 +401,7 @@ public class PodDBAdapter {
         }
         ContentValues values = new ContentValues();
         values.put(KEY_AUTO_DOWNLOAD, prefs.getAutoDownload());
-        values.put(KEY_GLOBAL_REFRESH, prefs.getGlobalRefresh());
+        values.put(KEY_KEEP_UPDATED, prefs.getKeepUpdated());
         values.put(KEY_AUTO_DELETE_ACTION,prefs.getAutoDeleteAction().ordinal());
         values.put(KEY_USERNAME, prefs.getUsername());
         values.put(KEY_PASSWORD, prefs.getPassword());
@@ -1147,7 +1147,7 @@ public class PodDBAdapter {
 
     /**
      * Returns a cursor which contains all feed items that are considered new.
-     * Excludes those feeds that do not have 'global_refresh' enabled.
+     * Excludes those feeds that do not have 'Keep Updated' enabled.
      * The returned cursor uses the FEEDITEM_SEL_FI_SMALL selection.
      */
     public final Cursor getNewItemsCursor() {
@@ -1156,7 +1156,7 @@ public class PodDBAdapter {
                 TABLE_NAME_FEED_ITEMS,
                 TABLE_NAME_FEEDS,
                 TABLE_NAME_FEED_ITEMS + "." + KEY_FEED + "=" + TABLE_NAME_FEEDS + "." + KEY_ID,
-                TABLE_NAME_FEED_ITEMS + "." + KEY_READ + "=" + FeedItem.NEW + " AND " + TABLE_NAME_FEEDS + "." + KEY_GLOBAL_REFRESH + " > 0",
+                TABLE_NAME_FEED_ITEMS + "." + KEY_READ + "=" + FeedItem.NEW + " AND " + TABLE_NAME_FEEDS + "." + KEY_KEEP_UPDATED + " > 0",
                 KEY_PUBDATE + " DESC"
         };
         final String query = String.format("SELECT %s FROM %s INNER JOIN %s ON %s WHERE %s ORDER BY %s", args);
@@ -1802,7 +1802,7 @@ public class PodDBAdapter {
 
                 // and now auto refresh
                 db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + PodDBAdapter.KEY_GLOBAL_REFRESH + " INTEGER DEFAULT 1");
+                        + " ADD COLUMN " + PodDBAdapter.KEY_KEEP_UPDATED + " INTEGER DEFAULT 1");
             }
 
             EventBus.getDefault().post(ProgressEvent.end());

core/src/main/res/values/strings.xml

@@ -536,7 +536,7 @@
     <string name="episode_filters_include">Include</string>
     <string name="episode_filters_exclude">Exclude</string>
     <string name="episode_filters_hint">Single words \n\"Multiple Words\"</string>
-    <string name="global_refresh">Global Refresh</string>
+    <string name="keep_updated">Keep Updated</string>
 
     <!-- Progress information -->
     <string name="progress_upgrading_database">Upgrading the database</string>