bugfix

app/src/main/java/org/nuclearfog/twidda/MainActivity.java

@@ -19,9 +19,9 @@ import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
 import android.widget.TabHost.TabSpec;
 
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.MainPage;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.viewadapter.TrendAdapter;
 import org.nuclearfog.twidda.window.AppSettings;

app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java

@@ -12,6 +12,7 @@ import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.listitems.Trend;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.viewadapter.TrendAdapter;
 

app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java

@@ -9,6 +9,7 @@ import android.util.Log;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.listitems.Message;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.MessageAdapter;
 import org.nuclearfog.twidda.window.DirectMessage;
 
@@ -42,18 +43,19 @@ public class MessageLoader extends AsyncTask<Void, Void, Void> {
     @Override
     protected Void doInBackground(Void... param) {
         try {
+            List<Message> msg;
             if (mAdapter.getItemCount() > 0) {
-                List<Message> msg = twitter.getMessages();
+                msg = twitter.getMessages();
-                mAdapter.setData(msg);
                 mData.storeMessage(msg);
+                msg = mData.getMessages();
             } else {
-                List<Message> msg = mData.getMessages();
+                msg = mData.getMessages();
                 if (msg.size() == 0) {
                     msg = twitter.getMessages();
                     mData.storeMessage(msg);
                 }
-                mAdapter.setData(msg);
             }
+            mAdapter.setData(msg);
         } catch (Exception err) {
             Log.e("Direct Message", err.getMessage());
         }

app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java

@@ -19,6 +19,7 @@ import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
 import org.nuclearfog.twidda.backend.listitems.TwitterUser;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.window.UserProfile;
 

app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java

@@ -23,6 +23,7 @@ import com.squareup.picasso.Picasso;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.window.SearchPage;
 import org.nuclearfog.twidda.window.TweetDetail;

app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java

@@ -8,6 +8,7 @@ import org.nuclearfog.twidda.backend.listitems.Message;
 import org.nuclearfog.twidda.backend.listitems.Trend;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
 import org.nuclearfog.twidda.backend.listitems.TwitterUser;
+import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.io.File;
 import java.util.ArrayList;

app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java

@@ -10,6 +10,7 @@ import android.widget.Toast;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
 import org.nuclearfog.twidda.backend.listitems.TwitterUser;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.viewadapter.UserAdapter;
 import org.nuclearfog.twidda.window.SearchPage;

app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java

@@ -14,6 +14,7 @@ import android.widget.Toast;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.listitems.TwitterUser;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.UserAdapter;
 import org.nuclearfog.twidda.window.UserDetail;
 

app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java

@@ -6,7 +6,6 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.Nullable;
 
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.listitems.Message;
 import org.nuclearfog.twidda.backend.listitems.Trend;
 import org.nuclearfog.twidda.backend.listitems.Tweet;

app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java

@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend;
+package org.nuclearfog.twidda.database;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -33,39 +33,74 @@ public class GlobalSettings {
 
 
     private GlobalSettings(Context context) {
-        settings = context.getSharedPreferences("settings",0);
+        settings = context.getSharedPreferences("settings", 0);
-        woeId = settings.getInt("world_id",1);
+        woeId = settings.getInt("world_id", 1);
         customWorldId = settings.getBoolean("custom_woeId", false);
-        woeIdPos = settings.getInt("world_id_pos",0);
+        woeIdPos = settings.getInt("world_id_pos", 0);
-        background_color = settings.getInt("background_color",0xff0f114a);
+        background_color = settings.getInt("background_color", 0xff0f114a);
-        highlight_color = settings.getInt("highlight_color",0xffff00ff);
+        highlight_color = settings.getInt("highlight_color", 0xffff00ff);
-        font_color = settings.getInt("font_color",0xffffffff);
+        font_color = settings.getInt("font_color", 0xffffffff);
-        tweet_color = settings.getInt("tweet_color",0xff19aae8);
+        tweet_color = settings.getInt("tweet_color", 0xff19aae8);
-        row = settings.getInt("preload",20);
+        row = settings.getInt("preload", 20);
-        loadImage = settings.getBoolean("image_load",true);
+        loadImage = settings.getBoolean("image_load", true);
-        loggedIn = settings.getBoolean("login",false);
+        loggedIn = settings.getBoolean("login", false);
-        key1 = settings.getString("key1","");
+        key1 = settings.getString("key1", "");
-        key2 = settings.getString("key2","");
+        key2 = settings.getString("key2", "");
-        userId = settings.getLong("userID",-1L);
+        userId = settings.getLong("userID", -1L);
         sdf = new SimpleDateFormat("dd.MM.yyyy, HH:mm:ss", Locale.GERMANY); // TODO editable date format
     }
 
+    public static GlobalSettings getInstance(Context context) {
+        if (ourInstance == null) {
+            ourInstance = new GlobalSettings(context);
+        }
+        return ourInstance;
+    }
+
     public int getBackgroundColor() {
         return background_color;
     }
 
+    public void setBackgroundColor(int color) {
+        Editor edit = settings.edit();
+        edit.putInt("background_color", color);
+        background_color = color;
+        edit.apply();
+    }
+
     public int getFontColor() {
         return font_color;
     }
 
+    public void setFontColor(int color) {
+        Editor edit = settings.edit();
+        edit.putInt("font_color", color);
+        font_color = color;
+        edit.apply();
+    }
+
     public int getHighlightColor() {
         return highlight_color;
     }
 
+    public void setHighlightColor(int color) {
+        Editor edit = settings.edit();
+        edit.putInt("highlight_color", color);
+        highlight_color = color;
+        edit.apply();
+    }
+
     public int getTweetColor() {
         return tweet_color;
     }
 
+    public void setTweetColor(int color) {
+        Editor edit = settings.edit();
+        edit.putInt("tweet_color", color);
+        tweet_color = color;
+        edit.apply();
+    }
+
     public boolean loadImages() {
         return loadImage;
     }
@@ -74,18 +109,39 @@ public class GlobalSettings {
         return woeId;
     }
 
+    public void setWoeId(long id) {
+        Editor edit = settings.edit();
+        edit.putInt("world_id", (int) id);
+        woeId = (int) id;
+        edit.apply();
+    }
+
     public boolean customWoeIdset() {
         return customWorldId;
     }
 
-    public int getWoeIdSelection(){
+    public int getWoeIdSelection() {
         return woeIdPos;
     }
 
+    public void setWoeIdSelection(int pos) {
+        Editor edit = settings.edit();
+        edit.putInt("world_id_pos", pos);
+        woeIdPos = pos;
+        edit.apply();
+    }
+
     public int getRowLimit() {
         return row;
     }
 
+    public void setRowLimit(int limit) {
+        Editor edit = settings.edit();
+        edit.putInt("preload", limit);
+        row = limit;
+        edit.apply();
+    }
+
     public boolean getLogin() {
         return loggedIn;
     }
@@ -97,7 +153,7 @@ public class GlobalSettings {
         return out;
     }
 
-    public long getUserId(){
+    public long getUserId() {
         return userId;
     }
 
@@ -105,49 +161,13 @@ public class GlobalSettings {
         return sdf;
     }
 
-
-    public void setBackgroundColor(int color) {
-        Editor edit  = settings.edit();
-        edit.putInt("background_color",color);
-        background_color = color;
-        edit.apply();
-    }
-
-    public void setFontColor(int color) {
-        Editor edit  = settings.edit();
-        edit.putInt("font_color",color);
-        font_color = color;
-        edit.apply();
-    }
-
-    public void setHighlightColor(int color) {
-        Editor edit  = settings.edit();
-        edit.putInt("highlight_color",color);
-        highlight_color = color;
-        edit.apply();
-    }
-
-    public void setTweetColor(int color) {
-        Editor edit  = settings.edit();
-        edit.putInt("tweet_color",color);
-        tweet_color = color;
-        edit.apply();
-    }
-
     public void setImageLoad(boolean image) {
-        Editor edit  = settings.edit();
+        Editor edit = settings.edit();
         edit.putBoolean("image_load", image);
         loadImage = image;
         edit.apply();
     }
 
-    public void setWoeId(long id) {
-        Editor edit  = settings.edit();
-        edit.putInt("world_id",(int)id);
-        woeId = (int)id;
-        edit.apply();
-    }
-
     public void setCustomWoeId(boolean customWoeId) {
         Editor edit = settings.edit();
         edit.putBoolean("custom_woeId", customWoeId);
@@ -155,20 +175,6 @@ public class GlobalSettings {
         edit.apply();
     }
 
-    public void setRowLimit(int limit) {
-        Editor edit  = settings.edit();
-        edit.putInt("preload", limit);
-        row = limit;
-        edit.apply();
-    }
-
-    public void setWoeIdSelection(int pos) {
-        Editor edit  = settings.edit();
-        edit.putInt("world_id_pos", pos);
-        woeIdPos = pos;
-        edit.apply();
-    }
-
     public void setConnection(String key1, String key2, Long userId) {
         Editor e = settings.edit();
         loggedIn = true;
@@ -181,12 +187,4 @@ public class GlobalSettings {
         e.putString("key2", key2);
         e.apply();
     }
-
-
-    public static GlobalSettings getInstance(Context context) {
-        if(ourInstance == null) {
-            ourInstance = new GlobalSettings(context);
-        }
-        return ourInstance;
-    }
 }

app/src/main/java/org/nuclearfog/twidda/window/AppSettings.java

@@ -24,7 +24,7 @@ import com.flask.colorpicker.OnColorChangedListener;
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.GlobalSettings;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.WorldIdAdapter;
 
 public class AppSettings extends AppCompatActivity implements OnClickListener,

app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java

@@ -20,10 +20,10 @@ import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.TwitterSearch;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
 import org.nuclearfog.twidda.backend.listitems.TwitterUser;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter.OnItemClicked;
 import org.nuclearfog.twidda.viewadapter.UserAdapter;

app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java

@@ -23,11 +23,11 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.ImagePopup;
 import org.nuclearfog.twidda.backend.StatusLoader;
 import org.nuclearfog.twidda.backend.StatusLoader.OnMediaClick;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter.OnItemClicked;
 

app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java

@@ -16,10 +16,10 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.ImagePopup;
 import org.nuclearfog.twidda.backend.StatusUpload;
 import org.nuclearfog.twidda.backend.StatusUpload.OnTweetSending;
+import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java

@@ -11,9 +11,9 @@ import android.view.MenuItem;
 import android.view.ViewGroup;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.UserLists;
 import org.nuclearfog.twidda.backend.listitems.TwitterUser;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.UserAdapter;
 import org.nuclearfog.twidda.viewadapter.UserAdapter.OnItemClicked;
 

app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java

@@ -20,9 +20,9 @@ import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.GlobalSettings;
 import org.nuclearfog.twidda.backend.ProfileLoader;
 import org.nuclearfog.twidda.backend.listitems.Tweet;
+import org.nuclearfog.twidda.database.GlobalSettings;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
 import org.nuclearfog.twidda.viewadapter.TimelineAdapter.OnItemClicked;