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

Linksharing fix, DB fix

Browse Source
This commit is contained in:
Georg Reisinger 2019-02-20 22:17:03 +01:00
parent 36dffa7664
commit e3a9736541
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,19 +558,9 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
finish.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String eingabeLink = linkEingabe.getText().toString();
String invite = linkEingabe.getText().toString();
String delString = null;
if (eingabeLink.contains("https://")) {
delString = "https://www.smartshopper.cf/invite/";
} else if (eingabeLink.contains("http://")) {
delString = "http://www.smartshopper.cf/invite/";
} else if (eingabeLink.contains("www.smartshopper.cf/invite/")) {
delString = "www.smartshopper.cf/invite/";
} else if (!eingabeLink.contains("www.smartshopper.cf/invite/")) {
delString = "";
}
String invite = eingabeLink.replace(delString, "");
try {
db.addInviteLink(invite, FirebaseAuth.getInstance().getCurrentUser().getUid());

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

@ -142,6 +142,22 @@ public class Database {
sqlUpdate2Param("DELETE FROM \"Shoppinglist_member\" WHERE sl_id = ? AND username = ?", sl_id, uid);
}
private String getinviteFromLink(String eingabeLink){
String delString = null;
if (eingabeLink.contains("https://")) {
delString = "https://www.smartshopper.cf/invite/";
} else if (eingabeLink.contains("http://")) {
delString = "http://www.smartshopper.cf/invite/";
} else if (eingabeLink.contains("www.smartshopper.cf/invite/")) {
delString = "www.smartshopper.cf/invite/";
} else if (!eingabeLink.contains("www.smartshopper.cf/invite/")) {
delString = "";
}
String invite = eingabeLink.replace(delString, "");
return invite;
}
/**
* Gibt den Invite link einer Shoppingliste zurück, wenn keiner vorhanden ist --> null
*
@ -166,7 +182,7 @@ public class Database {
*/
private String getSlIdFromInvite(String invitelink) throws SQLException, JSONException {
String SQL = "Select sl_id from \"Shoppinglist\" WHERE invitelink = ?";
String returnSl_id = executeQuery(SQL, invitelink);
String returnSl_id = executeQuery(SQL, getinviteFromLink(invitelink));
return returnSl_id;
}
@ -710,6 +726,24 @@ public class Database {
return jsonObjects;
}
/**
* Führt ein SQL Befehl aus und gibt die antwort in ein JSONObject List
*
* @param SQL Der SQL der auszuführen ist
* @return Das ergebnis als JSONObject
* @throws SQLException
* @throws JSONException
*/
public String executeQueryString1Param(String SQL, String param) throws SQLException, JSONException {
ArrayList<String> stringArrayList = new ArrayList<>();
PreparedStatement pstmt = conect.prepareStatement(SQL);
pstmt.setString(1, param);
ResultSet rsgroups = pstmt.executeQuery();
String result = rsgroups.getString(1);
return result;
}
/**
* Führt ein SQL Befehl aus und gibt die antwort in ein JSONObject List
*