URL encode + preference gestion serveur

JLo'w
1 parent 814b5a6f
Showing 6 changed files with 82 additions and 43 deletions Show diff stats
PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java
PremiereActivite/app/src/main/java/com/example/app_10p5/SettingsFragment.java
PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java
PremiereActivite/app/src/main/res/menu/menu.xml
PremiereActivite/app/src/main/res/values/strings.xml
PremiereActivite/app/src/main/res/xml/preferences.xml
@@ -3,16 +3,19 @@ package com.example.app_10p5;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
 import android.nfc.NfcAdapter;
 import android.nfc.Tag;
 import android.nfc.tech.MifareClassic;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.widget.Toast;
 import org.json.JSONObject;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.HashMap;
 /**
@@ -24,8 +27,6 @@ public class CarteActivite extends Activity implements ASyncResponse {
     private HashMap<String, String> mParam;
     private String mAPI;
-    public static String HOST = "https://10p5.clubinfo.frogeye.fr/";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -34,35 +35,40 @@ public class CarteActivite extends Activity implements ASyncResponse {
         mParam = new HashMap<String, String>();
-        switch (getIntent().getIntExtra("state", MainActivite.STATE_RIEN)) {
-            case MainActivite.STATE_COMMANDE:
-                //TODO: XOR du cancer
-                //mParam.put("quantite", String.valueOf(getIntent().getIntExtra("quantite", -1)));
-                mParam.put("montant", String.valueOf(getIntent().getFloatExtra("montant", -1)));
-                mParam.put("jeton", getIntent().getStringExtra("token"));
-                mAPI = "api/client/payer";
-                break;
-            case MainActivite.STATE_CREATION_COMPTE:
-                mParam.put("solde", String.valueOf(getIntent().getFloatExtra("montant", -1)));
-                mParam.put("jeton", getIntent().getStringExtra("token"));
-                mAPI = "api/client/ajouter";
-                break;
-            case MainActivite.STATE_RECHARGEMENT:
-                System.out.println("bite");
-                mParam.put("montant", String.valueOf(getIntent().getFloatExtra("montant", -1)));
-                mParam.put("jeton", getIntent().getStringExtra("token"));
-                mAPI = "api/client/recharger";
-                break;
-            case MainActivite.STATE_VIDANGE:
-                mParam.put("jeton", getIntent().getStringExtra("token"));
-                mAPI = "api/client/vidange";
-                break;
-            case MainActivite.STATE_CONNEXION:  //Impossible c'est pas géré ici
-            case MainActivite.STATE_RIEN:
-            default:
-                Toast.makeText(this, "WTF, le cancer est dans l'application!!", Toast.LENGTH_LONG).show();
-                finish();
-                return;
+        try {
+            switch (getIntent().getIntExtra("state", MainActivite.STATE_RIEN)) {
+                case MainActivite.STATE_COMMANDE:
+                    //TODO: XOR du cancer
+                    //mParam.put("quantite", String.valueOf(getIntent().getIntExtra("quantite", -1)));
+                    mParam.put("montant", URLEncoder.encode(String.valueOf(getIntent().getFloatExtra("montant", -1)), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mAPI = "api/client/payer";
+                    break;
+                case MainActivite.STATE_CREATION_COMPTE:
+                    mParam.put("solde", URLEncoder.encode(String.valueOf(getIntent().getFloatExtra("montant", -1)), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mAPI = "api/client/ajouter";
+                    break;
+                case MainActivite.STATE_RECHARGEMENT:
+                    System.out.println("bite");
+                    mParam.put("montant", URLEncoder.encode(String.valueOf(getIntent().getFloatExtra("montant", -1)), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mAPI = "api/client/recharger";
+                    break;
+                case MainActivite.STATE_VIDANGE:
+                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mAPI = "api/client/vidange";
+                    break;
+                case MainActivite.STATE_CONNEXION:  //Impossible c'est pas géré ici
+                case MainActivite.STATE_RIEN:
+                default:
+                    Toast.makeText(this, "WTF, le cancer est dans l'application!!", Toast.LENGTH_LONG).show();
+                    finish();
+                    return;
+            }
+        }
+        catch (Throwable t){
+            System.out.println("Exception: " + t.toString());
         }
         mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
@@ -182,7 +188,8 @@ public class CarteActivite extends Activity implements ASyncResponse {
     public void clientAPI() {
         try {
-            URL url = new URL(HOST + mAPI);
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+            URL url = new URL(settings.getString("server_address", null) + mAPI);
             NetworkThread nt = new NetworkThread(url, mParam);
             nt.delegate = this;
             nt.execute();
@@ -0,0 +1,17 @@
+package com.example.app_10p5;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+/**
+ * Created by beaus on 05/05/2016.
+ */
+public class SettingsFragment extends PreferenceFragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.preferences);
+    }
+}
@@ -41,12 +41,13 @@ public class main_tab_frag extends Fragment {
         tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
         final ViewPager viewPager = (ViewPager) ret.findViewById(R.id.pager);
-        final PagerAdapter adapter = new PagerAdapter(getFragmentManager(), tabLayout.getTabCount());
+        final PagerAdapter adapter = new PagerAdapter(getChildFragmentManager(), tabLayout.getTabCount());
         viewPager.setAdapter(adapter);
         viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
+
                 if(parent.getToken() != "" && System.currentTimeMillis() - parent.getTimeToken() < MainActivite.EXPIRATION){
                     viewPager.setCurrentItem(tab.getPosition());
                 }
@@ -67,7 +68,6 @@ public class main_tab_frag extends Fragment {
             }
         });
-
         return ret;
     }
@@ -19,12 +19,7 @@
         android:id="@+id/action_settings"
         android:title="@string/action_settings"
         android:showAsAction="never"
-        app:showAsAction="never"><menu>
-    <group android:checkableBehavior="single">
-        <item android:id="@+id/menu_2_choice_1" android:title="Geoffrey"  android:showAsAction="never" android:checked="true" />
-        <item android:id="@+id/menu_2_choice_2" android:title="Bar"  android:showAsAction="never" />
-    </group>
-</menu>
+        app:showAsAction="never">
     </item>
@@ -11,8 +11,17 @@
     <string name="passCarte">Passez la carte du client</string>
     <string name="disconnect">Déconnexion</string>
     <string name="connect">Connexion</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="server">Serveur</string>
+    <string name="serverTest">Serveur Test</string>
+    <string name="serverBar">Serveur Bar</string>
+    
+    <array name="server_entries">
+        <item>Polytech Bar</item>
+        <item>Beta Test</item>
+    </array>
+    <array name="server_values">
+        <item>http://pcbar.insecure.deule.net/</item>
+        <item>https://10p5.clubinfo.frogeye.fr/</item>
+    </array>
 </resources>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ListPreference
+        android:defaultValue="http://pcbar.insecure.deule.net/"
+        android:title="@string/server"
+        android:key="server_address"
+        android:entries="@array/server_entries"
+        android:entryValues="@array/server_values"/>
+
+</PreferenceScreen>
 \ No newline at end of file