dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Member an DB angepasst

Browse Source
This commit is contained in:
Georg Reisinger 2019-02-20 22:40:14 +01:00
parent 88bea3731b
commit e08c6fb8d5
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java
View File

@ -748,7 +748,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
TabHost tabhost = (TabHost) findViewById(R.id.tabHost1); TabHost tabhost = (TabHost) findViewById(R.id.tabHost1);
tabhost.setCurrentTab(1); tabhost.setCurrentTab(0);
sharedswiperefresh.setRefreshing(true); sharedswiperefresh.setRefreshing(true);
showSharedShoppingList(FirebaseAuth.getInstance().getCurrentUser().getUid()); showSharedShoppingList(FirebaseAuth.getInstance().getCurrentUser().getUid());

4
app/src/main/java/at/smartshopper/smartshopper/db/Database.java
View File

@ -98,7 +98,7 @@ public class Database {
public Member getAdmin(String sl_id) throws SQLException, JSONException { public Member getAdmin(String sl_id) throws SQLException, JSONException {
String SQL = "SELECT row_to_json(\"User\") as obj FROM \"User\" JOIN \"Shoppinglist_admin\" USING (username) WHERE sl_id = ?"; String SQL = "SELECT row_to_json(\"User\") as obj FROM \"User\" JOIN \"Shoppinglist_admin\" USING (username) WHERE sl_id = ?";
JSONObject jsonObject = new JSONObject(executeQuery(SQL, sl_id)); JSONObject jsonObject = new JSONObject(executeQuery(SQL, sl_id));
return new Member(jsonObject.getString("username"), jsonObject.getString("message_id")); return new Member(jsonObject.getString("username"), jsonObject.getString("message_id"), jsonObject.getString("name"), jsonObject.getString("picture"), jsonObject.getString("email"));
} }
/** /**
@ -113,7 +113,7 @@ public class Database {
List<JSONObject> jsonObjects = executeQueryJSONObject(SQL, sl_id); List<JSONObject> jsonObjects = executeQueryJSONObject(SQL, sl_id);
for(int i = 0; i < jsonObjects.size(); i++){ for(int i = 0; i < jsonObjects.size(); i++){
JSONObject jsonObject = jsonObjects.get(i); JSONObject jsonObject = jsonObjects.get(i);
members.add(new Member(jsonObject.getString("username"), jsonObject.getString("message_id"))); members.add(new Member(jsonObject.getString("username"), jsonObject.getString("message_id"), jsonObject.getString("name"), jsonObject.getString("picture"), jsonObject.getString("email")));
} }
return members; return members;
} }

19
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Member.java
View File

@ -1,11 +1,26 @@
package at.smartshopper.smartshopper.shoppinglist; package at.smartshopper.smartshopper.shoppinglist;
public class Member { public class Member {
private String uid, msid; private String uid, msid, name, pic, email;
public Member(String uid, String msid){ public Member(String uid, String msid, String name, String pic, String email){
this.uid = uid; this.uid = uid;
this.msid = msid; this.msid = msid;
this.name = name;
this.pic = pic;
this.email = email;
}
public String getName() {
return name;
}
public String getPic() {
return pic;
}
public String getEmail() {
return email;
} }
public String getUid() { public String getUid() {