Admins usage is now also in the list

erisee92 · Jan 15, 2016 · 898ac96 · 898ac96
1 parent 8be13bc
commit 898ac96
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "com.talk2machines.phoneunlockchecker"
@@ -22,8 +22,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.0'
-    compile 'com.android.support:design:22.2.0'
-    compile 'com.google.android.gms:play-services-gcm:8.1.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:design:23.1.1'
+    compile 'com.google.android.gms:play-services-gcm:8.4.0'
     compile project(":volley")
 }
diff --git a/app/src/main/java/com/talk2machines/phoneunlockchecker/CreatGroupActivity.java b/app/src/main/java/com/talk2machines/phoneunlockchecker/CreatGroupActivity.java
@@ -70,7 +70,7 @@ private void createNewGroup(EditText new_group_name, EditText group_pa) {
         } else {
             progress.show();
 
-            Session newGroup = new Session(new_group_name.getText().toString().trim(),group_pa.getText().toString().trim(), prefs.getString("LOG_NAME",""), prefs.getString("REG_ID",""));
+            Session newGroup = new Session(new_group_name.getText().toString().trim(),group_pa.getText().toString().trim(), prefs.getString("LOG_NAME",""), prefs.getString("LOG_USERNAME",""), prefs.getString("REG_ID",""));
 
             newGroup.createNewGroup(getApplicationContext(), new Session.VolleyCallback2() {
                 @Override

diff --git a/app/src/main/java/com/talk2machines/phoneunlockchecker/ListActivity.java b/app/src/main/java/com/talk2machines/phoneunlockchecker/ListActivity.java
@@ -118,18 +118,17 @@ private void getContent() {
             public void onSuccess(JSONArray result) {
                 Log.i("List",result.toString());
                 try {
-                    if(!result.getJSONObject(0).getString("response").equals("No Groups Created")){
-                        if(result.getJSONObject(0).getString("name")!= null && !result.getJSONObject(0).getString("name").isEmpty()) {
-                            ArrayList<Session> arrayOfSessions = new ArrayList<Session>();
+                    if(result.getJSONObject(0).getString("name")!= null && !result.getJSONObject(0).getString("name").isEmpty()) {
+                        ArrayList<Session> arrayOfSessions = new ArrayList<Session>();
 
-                            SessionAdapter adapter = new SessionAdapter(getApplicationContext(), arrayOfSessions);
-                            gl.setAdapter(adapter);
+                        SessionAdapter adapter = new SessionAdapter(getApplicationContext(), arrayOfSessions);
+                        gl.setAdapter(adapter);
 
-                            ArrayList<Session> newSessions = Session.fromJson(result);
-                            adapter.addAll(newSessions);
-                            mSwipeRefreshLayout.setRefreshing(false);
-                        }
+                        ArrayList<Session> newSessions = Session.fromJson(result);
+                        adapter.addAll(newSessions);
+                        mSwipeRefreshLayout.setRefreshing(false);
                     }
+
                 } catch (JSONException e) {
                     e.printStackTrace();
                     gl.setAdapter(null);

diff --git a/app/src/main/java/com/talk2machines/phoneunlockchecker/SessionActivity.java b/app/src/main/java/com/talk2machines/phoneunlockchecker/SessionActivity.java
@@ -150,7 +150,7 @@ public void onError(JSONObject result) {
             public void onSuccess(JSONObject result) {
                 Log.i("Join", result.toString());
                 try {
-                    String admin = result.getString("admin");
+                    String admin = result.getString("name")+ ' '+ getString(R.string.by) +' '+result.getString("admin");
                     JSONArray userlist = result.getJSONArray("users");
 
                     TextView ad = (TextView) findViewById(R.id.sessionadmin);

diff --git a/app/src/main/java/com/talk2machines/phoneunlockchecker/api/Session.java b/app/src/main/java/com/talk2machines/phoneunlockchecker/api/Session.java
@@ -29,6 +29,7 @@ public class Session {
 
     public String name;
     public String admin;
+    public String adminusername;
     public String id;
     public String password;
     public String reg_id;
@@ -39,9 +40,10 @@ public Session() {
     }
 
     //Struktur für new group
-    public Session(String groupname,String Password, String adminname, String reg_id){
+    public Session(String groupname,String Password, String adminname, String adminusername, String reg_id){
         this.name = groupname;
         this.admin = adminname;
+        this.adminusername = adminusername;
         this.password = Password;
         this.reg_id = reg_id;
         Log.i("API",name+" "+admin+" "+password +" "+reg_id);
@@ -175,6 +177,7 @@ protected Map<String, String> getParams() throws AuthFailureError {
                 params.put("name", name);
                 params.put("password", password);
                 params.put("admin",admin);
+                params.put("adminusername",adminusername);
                 params.put("reg_id",reg_id);
                 return params;
             }

diff --git a/app/src/main/res/layout/activity_session.xml b/app/src/main/res/layout/activity_session.xml
@@ -10,7 +10,8 @@
         android:text="Admin"
         android:id="@+id/sessionadmin"
         android:layout_marginTop="10dp"
-        android:textSize="@dimen/fab_size_normal"/>
+        android:textIsSelectable="true"
+        android:textSize="@dimen/abc_text_size_display_1_material" />
 
 
     <ListView