Merge branch 'master' of https://github.com/Alkarex/EasyRSS

Alkarex · May 8, 2020 · c2d1177 · c2d1177
2 parents 4f64d95 + 6457182
commit c2d1177
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/src/main/java/org/freshrss/easyrss/Home.java b/app/src/main/java/org/freshrss/easyrss/Home.java
@@ -251,22 +251,23 @@ public void onLogoutRequired() {
             public void onClick(final DialogInterface dialog, final int which) {
                 ProgressDialog.show(new ContextThemeWrapper(Home.this, android.R.style.Theme_DeviceDefault_Dialog),
                         Home.this.getString(R.string.TxtWorking), Home.this.getString(R.string.TxtClearingCache));
-                final Handler handler = new Handler() {
+                /*final Handler handler = new Handler() {
                     @Override
                     public void handleMessage(final Message msg) {
                         final Intent intent = new Intent(Home.this, Home.class);
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         Home.this.startActivity(intent);
                         finish();
                     }
-                };
+                };*/
                 final Thread thread = new Thread() {
                     @Override
                     public void run() {
                         DataMgr.getInstance().clearAll();
                         ReaderAccountMgr.getInstance().clearLogin();
                         DataUtils.deleteFile(new File(DataUtils.getAppFolderPath()));
-                        handler.sendEmptyMessage(0);
+                        //handler.sendEmptyMessage(0);
+                        System.exit(0);
                     }
                 };
                 thread.setPriority(Thread.MIN_PRIORITY);

diff --git a/app/src/main/java/org/freshrss/easyrss/network/GlobalItemDataSyncer.java b/app/src/main/java/org/freshrss/easyrss/network/GlobalItemDataSyncer.java
@@ -139,7 +139,7 @@ protected void startSyncing() throws DataSyncerException {
         NetworkMgr.getInstance().startSyncItemContent();
 
         final SettingNotificationOn sNotification = new SettingNotificationOn(dataMgr);
-        if (sNotification.getData()) {
+        if (sNotification.getData() != null) {
             final String sSetting = dataMgr.getSettingByName(Setting.SETTING_GLOBAL_ITEM_UNREAD_COUNT);
             final int unreadCount = (sSetting == null) ? 0 : Integer.valueOf(sSetting);
             if (unreadCount > 0) {