set default sync interval to 15min

Signed-off-by: David Luhmer <david-dev@live.de>

2 files changed, 31 insertions, 42 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
index 3a363d7b..53bffb53 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
@@ -61,38 +61,15 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.sync_interval_selector, menu);
         return true;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically StartYoutubePlayer clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        if(id == R.id.action_save) {
-            int checkedPosition = mFragment.lvItems.getCheckedItemPosition();
-
-            Integer minutes = Integer.parseInt(items_values[checkedPosition]);
-
-            mPrefs.edit().putInt(SYNC_INTERVAL_IN_MINUTES_STRING, minutes).commit();
-
-            setAccountSyncInterval(this, mPrefs);
-
-            finish();
-        }
-
-
-        return super.onOptionsItemSelected(item);
-    }
-
+    public static final int SYNC_DEFAULT_INTERVAL = 15;
 
     public static void setAccountSyncInterval(Context context, SharedPreferences mPrefs) {
-        int minutes = mPrefs.getInt(SYNC_INTERVAL_IN_MINUTES_STRING, 1440);
+        int minutes = mPrefs.getInt(SYNC_INTERVAL_IN_MINUTES_STRING, SYNC_DEFAULT_INTERVAL);
 
         AccountManager mAccountManager = AccountManager.get(context);
         Account[] accounts = mAccountManager.getAccountsByType(AccountGeneral.ACCOUNT_TYPE);
@@ -120,15 +97,33 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity {
      */
 
     // Sync interval constants
-    public static final long MILLISECONDS_PER_SECOND = 1000L;
     public static final long SECONDS_PER_MINUTE = 60L;
-    //public static final long SYNC_INTERVAL_IN_MINUTES = 60L;
     public static final String SYNC_INTERVAL_IN_MINUTES_STRING = "SYNC_INTERVAL_IN_MINUTES_STRING";
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically StartYoutubePlayer clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == R.id.action_save) {
+            int checkedPosition = mFragment.lvItems.getCheckedItemPosition();
+            int minutes = Integer.parseInt(items_values[checkedPosition]);
+            mPrefs.edit().putInt(SYNC_INTERVAL_IN_MINUTES_STRING, minutes).commit();
+            setAccountSyncInterval(this, mPrefs);
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+    // public static final int SYNC_DEFAULT_INTERVAL = 60*24;
+
     public static class PlaceholderFragment extends Fragment {
 
         private ListView lvItems;
-        protected @Inject SharedPreferences mPrefs;
+        protected @Inject
+        SharedPreferences mPrefs;
 
         public PlaceholderFragment() {
         }
@@ -149,25 +144,19 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity {
             lvItems = rootView.findViewById(R.id.lv_sync_interval_items);
             lvItems.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
 
-
             ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
                     android.R.layout.simple_list_item_single_choice, android.R.id.text1, items);
 
-
             lvItems.setAdapter(adapter);
 
-            if(!mPrefs.contains(SYNC_INTERVAL_IN_MINUTES_STRING)) {
-                lvItems.setItemChecked(items.length - 1, true); // The last item is 24hours. This is the default value!
-            } else {
-                int position = 0;
-                int minutes = mPrefs.getInt(SYNC_INTERVAL_IN_MINUTES_STRING, 1440);
-                for(String item : ((SyncIntervalSelectorActivity)getActivity()).items_values) {
-                    if(Integer.parseInt(item) == minutes)
-                        break;
-                    position++;
-                }
-                lvItems.setItemChecked(position, true);//The last item is 24hours. This is the default value!
+            int position = 0;
+            int minutes = mPrefs.getInt(SYNC_INTERVAL_IN_MINUTES_STRING, SYNC_DEFAULT_INTERVAL);
+            for (String item : ((SyncIntervalSelectorActivity) getActivity()).items_values) {
+                if (Integer.parseInt(item) == minutes)
+                    break;
+                position++;
             }
+            lvItems.setItemChecked(position, true);
 
             return rootView;
         }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java
index 1671a6fe..8f71fc8e 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java
@@ -287,7 +287,7 @@ public class NextcloudNotificationManager {
                         .setContentTitle(tickerMessage)
                         .setStyle(new NotificationCompat.BigTextStyle().bigText(previewText))
                         //.setDefaults(Notification.DEFAULT_ALL)
-                        .addAction(R.drawable.ic_check_box_white, context.getString(R.string.menu_markAllAsRead), markAllAsReadPendingIntent)
+                        .addAction(R.drawable.ic_checkbox_white, context.getString(R.string.menu_markAllAsRead), markAllAsReadPendingIntent)
                         .setAutoCancel(true)
                         .setNumber(newItemsCount)
                         .setContentText(contentText);