diff options
| author | Camil Staps | 2015-06-10 23:14:09 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 23:14:09 +0200 |
| commit | 77184f5fc917231bf9ae0f2f587bfaad1404b075 (patch) | |
| tree | 6fe689d45fc734e0e4cad169e64fbe28641f7c15 /app | |
| parent | Merge branch 'master' of github:camilstaps/RSSin (diff) | |
| parent | Merge branch 'master' of http://github.com/camilstaps/RSSin (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/rssin/Feed.java
Diffstat (limited to 'app')
8 files changed, 21 insertions, 9 deletions
diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java index a1b9656..1ac091e 100755 --- a/app/src/main/java/org/rssin/android/FeedsActivity.java +++ b/app/src/main/java/org/rssin/android/FeedsActivity.java @@ -116,7 +116,7 @@ public class FeedsActivity extends ActionBarActivity { /** * Open dialog to add new feed * For the moment, we temporarily disable rotating because we can't get it working otherwise. - * @todo make rotating possible + * Possible feature: make rotating possible */ public void openAddDialog() { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java index 93bffdf..ae0327a 100755 --- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java +++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java @@ -72,7 +72,7 @@ public class FilterSettingsActivity extends ActionBarActivity { Intent intent = getIntent(); int filterHashCode = intent.getIntExtra("filter", -1); - // @todo Check on -1? Shouldn't happen anyway. + // Check on -1? Shouldn't happen anyway. filter = filtersList.getFilterFromHashCode(filterHashCode); setTitle(); @@ -205,7 +205,7 @@ public class FilterSettingsActivity extends ActionBarActivity { /** * Open dialog to edit title * For the moment, we temporarily disable rotating because we can't get it working otherwise. - * @todo make rotating possible + * Possible feature: make rotating possible */ public void openTitleDialog() { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); diff --git a/app/src/main/java/org/rssin/android/InternalStorageProvider.java b/app/src/main/java/org/rssin/android/InternalStorageProvider.java index 6241c2d..a09eefa 100644 --- a/app/src/main/java/org/rssin/android/InternalStorageProvider.java +++ b/app/src/main/java/org/rssin/android/InternalStorageProvider.java @@ -46,7 +46,6 @@ class InternalStorageProvider implements StorageProvider<String, FeedSorter>, Fi private final Context context; - // @todo redo singleton public InternalStorageProvider(Context context) { this.context = context; } diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java index 3e52b1b..7f6163a 100755 --- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java +++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java @@ -117,7 +117,7 @@ public class NavigationDrawerManageFeedsFragment extends Fragment { /**
* Open dialog to add new feed
* For the moment, we temporarily disable rotating because we can't get it working otherwise.
- * @todo make rotating possible
+ * Possible feature: make rotating possible
*/
public void openAddDialog() {
//setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java index 84d9a0d..a0d9b55 100644 --- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java +++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java @@ -124,7 +124,7 @@ public class NavigationDrawerManageFiltersFragment extends Fragment { /**
* Open dialog to create new filter
* For the moment, we temporarily disable rotating because we can't get it working otherwise.
- * @todo make rotating possible
+ * Possible feature: make rotating possible
*/
public void openAddDialog() {
//setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
diff --git a/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java b/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java index bd43305..5c7db3f 100644..100755 --- a/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java +++ b/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java @@ -120,9 +120,20 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage .apply(); } + + private long lastKey = -1; @Override public Object uniqueKey() { - return Long.toString(System.currentTimeMillis()); + long key = System.currentTimeMillis(); + + // Make sure the same key isn't returned twice. + if(key <= lastKey) + { + key = lastKey + 1; + } + + lastKey = key; + return Long.toString(key); } @Override diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java index bf9aa5d..943e65c 100755 --- a/app/src/main/java/org/rssin/rssin/Feed.java +++ b/app/src/main/java/org/rssin/rssin/Feed.java @@ -19,6 +19,7 @@ package org.rssin.rssin; import android.content.Context; +import android.util.Log; import org.json.JSONException; import org.json.JSONObject; @@ -39,7 +40,7 @@ import java.net.URL; /** * Feed holder * @author Camil Staps - * @todo Allow users to enter links without scheme (http:// ...) + * Possible feature: Allow users to enter links without scheme (http:// ...) */ public class Feed implements Storable, Comparable<Feed>, Jsonable { private static final long serialVersionUID = 0; @@ -125,6 +126,7 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable { /** * Get the title from the feed, or, if that fails, cleverly make up a title based on the URL + * Possible feature: make it really really clever */ public void setTitleFromURL(final FeedStorageProvider storageProvider, Fetcher fetcher, final FallibleListener<String, Object> titlehasChanged) { String newTitle = url.getHost(); diff --git a/app/src/main/java/org/rssin/rssin/Filter.java b/app/src/main/java/org/rssin/rssin/Filter.java index ec7a23c..8de2325 100644 --- a/app/src/main/java/org/rssin/rssin/Filter.java +++ b/app/src/main/java/org/rssin/rssin/Filter.java @@ -35,7 +35,7 @@ import java.util.List; * Filter holder * @author Camil Staps * - * @todo Write read & writeObject with JSON or so to make it easier to change this class later + * Possible feature: Write read & writeObject with JSON or so to make it easier to change this class later */ public class Filter implements Storable, Comparable<Filter>, Jsonable { |