removed answer load setting, bug fix

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

@@ -9,6 +9,7 @@ import java.util.Locale;
 
 public class GlobalSettings {
 
+    private static final String NAME = "settings";
     private static GlobalSettings ourInstance;
 
     private SharedPreferences settings;
@@ -21,7 +22,6 @@ public class GlobalSettings {
     private int tweet_color;
 
     private boolean loadImage;
-    private boolean loadAnswer;
     private boolean loggedIn;
     private boolean customWorldId;
     private int row;
@@ -33,7 +33,7 @@ public class GlobalSettings {
     private long userId;
 
     private GlobalSettings(Context context) {
-        settings = context.getSharedPreferences("settings", 0);
+        settings = context.getSharedPreferences(NAME, 0);
         woeId = settings.getInt("world_id", 1);
         customWorldId = settings.getBoolean("custom_woeId", false);
         woeIdPos = settings.getInt("world_id_pos", 0);
@@ -43,7 +43,6 @@ public class GlobalSettings {
         tweet_color = settings.getInt("tweet_color", 0xff19aae8);
         row = settings.getInt("preload", 20);
         loadImage = settings.getBoolean("image_load", true);
-        loadAnswer = settings.getBoolean("answer_load", true);
         loggedIn = settings.getBoolean("login", false);
         key1 = settings.getString("key1", "");
         key2 = settings.getString("key2", "");
@@ -169,27 +168,6 @@ public class GlobalSettings {
         edit.apply();
     }
 
-    /**
-     * answer loading enabled
-     *
-     * @return if answer loading is enabled
-     */
-    public boolean getAnswerLoad() {
-        return loadAnswer;
-    }
-
-    /**
-     * enable/disable answer loading
-     *
-     * @param loadAnswer true if enabled
-     */
-    public void setAnswerLoad(boolean loadAnswer) {
-        this.loadAnswer = loadAnswer;
-        Editor edit = settings.edit();
-        edit.putBoolean("answer_load", loadAnswer);
-        edit.apply();
-    }
-
     /**
      * get World ID for trends
      *
@@ -339,11 +317,7 @@ public class GlobalSettings {
     public void logout() {
         loggedIn = false;
         Editor e = settings.edit();
-        e.putBoolean("login", false);
+        e.clear();
-        e.remove("userID").remove("key1").remove("key2").remove("custom_woeId")
-                .remove("image_load").remove("preload").remove("world_id_pos")
-                .remove("world_id").remove("tweet_color").remove("highlight_color")
-                .remove("highlight_color").remove("font_color").remove("background_color");
         e.apply();
     }
 }

app/src/main/java/org/nuclearfog/twidda/fragment/backend/TweetLoader.java

@@ -14,7 +14,6 @@ import org.nuclearfog.twidda.backend.TwitterEngine;
 import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.items.Tweet;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
-import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -41,7 +40,6 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
     private TwitterException err;
     private DatabaseAdapter db;
     private List<Tweet> tweets;
-    private boolean loadAnswer;
 
 
     public TweetLoader(@NonNull View root, Mode mode) {
@@ -50,8 +48,6 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
         RecyclerView list = root.findViewById(R.id.fragment_list);
         adapter = (TweetAdapter) list.getAdapter();
         db = new DatabaseAdapter(root.getContext());
-        GlobalSettings settings = GlobalSettings.getInstance(root.getContext());
-        loadAnswer = settings.getAnswerLoad();
         this.mode = mode;
     }
 
@@ -143,7 +139,7 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
                     String search = (String) param[1];
                     if (adapter.isEmpty()) {
                         tweets = db.getAnswers(tweetId);
-                        if (tweets.isEmpty() && loadAnswer) {
+                        if (tweets.isEmpty()) {
                             tweets = mTwitter.getAnswers(search, tweetId, sinceId);
                             if (!tweets.isEmpty() && db.containStatus(tweetId))
                                 db.storeReplies(tweets);

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

@@ -47,7 +47,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
 
     private GlobalSettings settings;
     private Button colorButton1, colorButton2, colorButton3, colorButton4;
-    private CheckBox toggleImg, toggleAns;
+    private CheckBox toggleImg;
     private EditText woeIdText;
     private TextView link;
     private Spinner woeId;
@@ -68,7 +68,6 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
         colorButton3 = findViewById(R.id.color_popup);
         colorButton4 = findViewById(R.id.highlight_color);
         toggleImg = findViewById(R.id.toggleImg);
-        toggleAns = findViewById(R.id.toggleAns);
         woeIdText = findViewById(R.id.woe_id);
         woeId = findViewById(R.id.woeid);
         root = findViewById(R.id.settings_layout);
@@ -97,7 +96,6 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
     protected void onStart() {
         super.onStart();
         toggleImg.setChecked(settings.getImageLoad());
-        toggleAns.setChecked(settings.getAnswerLoad());
         woeId.setAdapter(new WorldIdAdapter(this));
         woeId.setSelection(settings.getWoeIdSelection());
         colorButton1.setBackgroundColor(settings.getBackgroundColor());
@@ -111,7 +109,6 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
             woeIdText.setText(text);
         }
         toggleImg.setOnCheckedChangeListener(this);
-        toggleAns.setOnCheckedChangeListener(this);
     }
 
 
@@ -260,14 +257,8 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
 
     @Override
     public void onCheckedChanged(CompoundButton c, boolean checked) {
-        switch (c.getId()) {
+        if (c.getId() == R.id.toggleImg) {
-            case R.id.toggleImg:
+            settings.setImageLoad(checked);
-                settings.setImageLoad(checked);
-                break;
-
-            case R.id.toggleAns:
-                settings.setAnswerLoad(checked);
-                break;
         }
     }
 

app/src/main/res/layout/page_settings.xml

@@ -123,16 +123,6 @@
                     android:text="@string/image"
                     android:textSize="@dimen/textsize_checkbox" />
 
-                <CheckBox
-                    android:id="@+id/toggleAns"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/button_dm"
-                    android:layout_marginStart="@dimen/padding_side"
-                    android:layout_marginLeft="@dimen/padding_side"
-                    android:layout_weight="1"
-                    android:text="@string/toggle_answer"
-                    android:textSize="@dimen/textsize_checkbox" />
-
             </LinearLayout>
 
             <TextView