@@ -8,7 +8,7 @@ android {

         minSdkVersion 16

         targetSdkVersion 26

         versionCode 1

-        versionName "1.0"

+        versionName "1.1"

         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

         vectorDrawables.useSupportLibrary = true

     }

@@ -19,7 +19,7 @@

                 <category android:name="android.intent.category.LAUNCHER" />

             </intent-filter>

         </activity>

-

+        <fragment android:name=".views.SettingsActivityFragment" />

         <receiver

             android:name=".controllers.SyncManager$RefreshBroadcastReceiver"

             android:exported="true">

@@ -8,6 +8,7 @@ import android.content.SharedPreferences;

 import android.graphics.Color;

 import android.net.Uri;

 import android.os.Build;

+import android.os.Handler;

 import android.preference.PreferenceManager;

 import android.support.v4.app.NotificationCompat;

 import android.widget.Toast;

@@ -141,13 +142,18 @@ public class FlashManager {

         int min = 0;

         int max = sorted.length - 1;

-        if(max < 0){

-            max = 0;

-        }

+

         if (max > flashesToStoreInDatabase) {

             min = max - flashesToStoreInDatabase;

         }

         JSONArray output = new JSONArray();

+        if(min < 0 || max >= sorted.length){

+            min = 0;

+            max = sorted.length - 1;

+        }

+        if(max < 0){

+            max = 0;

+        }

         for (int i = min; i <= max; i++) {

             output.put(sorted[i].serialize());

         }

@@ -246,9 +252,17 @@ public class FlashManager {

                             DebugManager.sendDebugNotification("Error occurred while trying push notifications: " + exception.getLocalizedMessage(), context);

                         }

                     }

-                    if(MainFlashActivity.activeInstance != null){

-                        MainFlashActivity.activeInstance.regenerateToolbarStatus();

-                    }

+                    Handler mainHandler = new Handler(context.getMainLooper());

+                    Runnable myRunnable = new Runnable() {

+                        @Override

+                        public void run() {

+                            if(MainFlashActivity.activeInstance != null){

+                                MainFlashActivity.activeInstance.regenerateToolbarStatus();

+                            }

+                        }

+                    };

+                    mainHandler.post(myRunnable);

+

                 }

                 @Override

@@ -256,9 +270,16 @@ public class FlashManager {

                     lastContactSuccessful = ConnectionStatus.INVALID;

                     exception.printStackTrace();

                     DebugManager.sendDebugNotification("An error occurred while trying to receive flashes: " + exception.getLocalizedMessage(), context);

-                    if(MainFlashActivity.activeInstance != null){

-                        MainFlashActivity.activeInstance.regenerateToolbarStatus();

-                    }

+                    Handler mainHandler = new Handler(context.getMainLooper());

+                    Runnable myRunnable = new Runnable() {

+                        @Override

+                        public void run() {

+                            if(MainFlashActivity.activeInstance != null){

+                                MainFlashActivity.activeInstance.regenerateToolbarStatus();

+                            }

+                        }

+                    };

+                    mainHandler.post(myRunnable);

                 }

             }, context);

         } catch (MalformedURLException exception) {

@@ -267,8 +288,15 @@ public class FlashManager {

         } catch (Exception exception) {

             exception.printStackTrace();

         }

-        if(MainFlashActivity.activeInstance != null){

-            MainFlashActivity.activeInstance.regenerateToolbarStatus();

-        }

+        Handler mainHandler = new Handler(context.getMainLooper());

+        Runnable myRunnable = new Runnable() {

+            @Override

+            public void run() {

+                if(MainFlashActivity.activeInstance != null){

+                    MainFlashActivity.activeInstance.regenerateToolbarStatus();

+                }

+            }

+        };

+        mainHandler.post(myRunnable);

     }

 }

@@ -11,6 +11,7 @@ import android.widget.TextView;

 import app.librenews.io.librenews.R;

 import app.librenews.io.librenews.controllers.FlashManager;

+import app.librenews.io.librenews.controllers.SyncManager;

 public class MainFlashActivity extends AppCompatActivity {

     public static MainFlashActivity activeInstance;

@@ -66,7 +67,6 @@ public class MainFlashActivity extends AppCompatActivity {

                 manager.refresh();

             }

         });

-        regenerateToolbarStatus();

     }

     @Override

@@ -9,25 +9,24 @@ import app.librenews.io.librenews.R;

 import app.librenews.io.librenews.controllers.FlashManager;

 import app.librenews.io.librenews.controllers.SyncManager;

-public class SettingsActivityFragment extends PreferenceFragment {

+public class SettingsActivityFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener{

     @Override

-    public void onCreate(final Bundle savedInstanceState) {

+    public void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);

         // Load the preferences from an XML resource

         addPreferencesFromResource(R.xml.preferences);

-        SharedPreferences.OnSharedPreferenceChangeListener spChanged = new

-                SharedPreferences.OnSharedPreferenceChangeListener() {

-                    @Override

-                    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,

-                                                          String key) {

-                        if(key.equals("refresh_preference") || key.equals("automatically_refresh")){

-                            new SyncManager(getView().getContext(), new FlashManager(getView().getContext())).startSyncService();

-                        }

-                        if(MainFlashActivity.activeInstance != null){

-                            MainFlashActivity.activeInstance.regenerateToolbarStatus();

-                        }

-                    }

-                };

-        PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(spChanged);

+        PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(this);

+    }

+

+    @Override

+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,

+                                          String key) {

+        System.out.println(key + " changed!");

+        if(key.equals("refresh_preference") || key.equals("automatically_refresh")){

+            new SyncManager(getView().getContext(), new FlashManager(getView().getContext())).startSyncService();

+        }

+        if (getActivity() instanceof MainFlashActivity) {

+            ((MainFlashActivity)getActivity()).regenerateToolbarStatus();

+        }

     }

 }

@@ -34,5 +34,10 @@

     Les notifications d\'actualités sont parmi les canaux les plus importants par lesquels nous recevons des informations. LibreNews vise à démocratiser ce processus en fournissant un service de notification d\'actualités minimaliste, libre, open source, rapide, sécurisé et décentralisé qui fonctionnera sur presque n\'importe quel smartphone.</p>

     ]]>

     </string>

+    <string name="title_activity_welcome">Welcome to LibreNews</string>

+    <string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>

+    <string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>

+    <string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>

+    <string name="start_app">START LIBRENEWS</string>

 </resources>

@@ -34,5 +34,11 @@

     最新ニュースの通知は、情報を受け取るために最も重要なチャネルの 1 つです。LibreNews はほぼすべての携帯で動作して、 <i>ミニマリスト、フリー、オープンソース、ファースト、セキュア、 そして 分散 ニュース通知サービス を提供することで、このプロセスを民主化することを目指しています。

     ]]>

     </string>

+    <string name="title_activity_welcome">Welcome to LibreNews</string>

+    <string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>

+    <string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>

+    <string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>

+    <string name="start_app">START LIBRENEWS</string>

+    <string name="status_text" formatted="false">syncing every {rate}</string>

 </resources>

@@ -36,8 +36,6 @@

     </string>

     <string name="title_activity_welcome">Welcome to LibreNews</string>

-    <string name="dummy_button">Dummy Button</string>

-    <string name="dummy_content">DUMMY\nCONTENT</string>

     <string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>

     <string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>

     <string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>