Merge pull request #114 from ModdingFox/Issue_112&113

Bug Fixes

Author: Royce Whetstine

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "open.furaffinity.client"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 29
-        versionName "0.2.9"
+        versionCode 30
+        versionName "0.3.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/open/furaffinity/client/fragmentTabs/manageAccountSettings.java

@@ -19,7 +19,6 @@
 
 public class manageAccountSettings extends appFragment {
     private EditText fa_useremail;
-    private Spinner ssl_enable;
     private Spinner bdaymonth;
     private Spinner bdayday;
     private Spinner bdayyear;
@@ -53,7 +52,6 @@ protected int getLayout() {
 
     protected void getElements(View rootView) {
         fa_useremail = rootView.findViewById(R.id.fa_useremail);
-        ssl_enable = rootView.findViewById(R.id.ssl_enable);
         bdaymonth = rootView.findViewById(R.id.bdaymonth);
         bdayday = rootView.findViewById(R.id.bdayday);
         bdayyear = rootView.findViewById(R.id.bdayyear);
@@ -97,7 +95,6 @@ protected void initPages() {
             public void requestSucceeded(abstractPage abstractPage) {
                 fa_useremail.setText(((controlsSettings) abstractPage).getFaUserEmail());
 
-                uiControls.spinnerSetAdapter(requireContext(), ssl_enable, ((controlsSettings) abstractPage).getSslEnable(), ((controlsSettings) abstractPage).getSslEnableCurrent(), true, false);
                 uiControls.spinnerSetAdapter(requireContext(), bdaymonth, ((controlsSettings) abstractPage).getBDayMonth(), ((controlsSettings) abstractPage).getBDayMonthCurrent(), true, false);
                 uiControls.spinnerSetAdapter(requireContext(), bdayday, ((controlsSettings) abstractPage).getBDayDay(), ((controlsSettings) abstractPage).getBDayDayCurrent(), true, false);
                 uiControls.spinnerSetAdapter(requireContext(), bdayyear, ((controlsSettings) abstractPage).getBDayYear(), ((controlsSettings) abstractPage).getBDayYearCurrent(), true, false);
@@ -155,7 +152,6 @@ public void requestFailed(abstractPage abstractPage) {
                         }
                     },
                             fa_useremail.getText().toString(),
-                            ((kvPair) ssl_enable.getSelectedItem()).getKey(),
                             ((kvPair) bdaymonth.getSelectedItem()).getKey(),
                             ((kvPair) bdayday.getSelectedItem()).getKey(),
                             ((kvPair) bdayyear.getSelectedItem()).getKey(),

app/src/main/java/open/furaffinity/client/submitPages/submitControlsSettings.java

@@ -13,7 +13,6 @@
 
 public class submitControlsSettings extends open.furaffinity.client.abstractClasses.abstractPage {
     private final String fa_useremail;
-    private final String ssl_enable;
     private final String bdaymonth;
     private final String bdayday;
     private final String bdayyear;
@@ -37,10 +36,9 @@ public class submitControlsSettings extends open.furaffinity.client.abstractClas
 
     private String errorMessage;
 
-    public submitControlsSettings(Context context, abstractPage.pageListener pageListener, String fa_useremail, String ssl_enable, String bdaymonth, String bdayday, String bdayyear, String viewmature, String timezone, String timezone_dst, String fullview, String style, String stylesheet, String scales_enabled, String paypal_email, String display_mode, String scales_message_enabled, String scales_name, String scales_plural_name, String scales_cost, String account_disabled, String newpassword, String newpassword2, String oldpassword) {
+    public submitControlsSettings(Context context, abstractPage.pageListener pageListener, String fa_useremail, String bdaymonth, String bdayday, String bdayyear, String viewmature, String timezone, String timezone_dst, String fullview, String style, String stylesheet, String scales_enabled, String paypal_email, String display_mode, String scales_message_enabled, String scales_name, String scales_plural_name, String scales_cost, String account_disabled, String newpassword, String newpassword2, String oldpassword) {
         super(context, pageListener);
         this.fa_useremail = fa_useremail;
-        this.ssl_enable = ssl_enable;
         this.bdaymonth = bdaymonth;
         this.bdayday = bdayday;
         this.bdayyear = bdayyear;
@@ -89,7 +87,6 @@ protected Boolean doInBackground(Void... voids) {
         HashMap<String, String> params = new HashMap<>();
         params.put("do", "update");
         params.put("fa_useremail", fa_useremail);
-        params.put("ssl_enable", ssl_enable);
         params.put("bdaymonth", bdaymonth);
         params.put("bdayday", bdayday);
         params.put("bdayyear", bdayyear);

app/src/main/java/open/furaffinity/client/utilities/webClient.java

@@ -122,8 +122,10 @@ private String getPageResponse(int responseCode, HttpURLConnection httpURLConnec
             StringBuilder html = new StringBuilder();
             String line;
 
+            boolean foundDOCTYPE = false;
             while ((line = reader.readLine()) != null) {
-                html.append(line);
+                if (line.contains("!DOCTYPE")) { foundDOCTYPE = true; }
+                if(foundDOCTYPE) { html.append(line); }
             }
             result = html.toString();
 

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

@@ -30,16 +30,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Account Security Level" />
-
-            <Spinner
-                android:id="@+id/ssl_enable"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"