GitNex/GitNex
GitNex
/
GitNex
mirror of https://codeberg.org/gitnex/GitNex.git
2
5
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix creating multiple tokens. The changes were from upstream API

This commit is contained in:
M M Arif 2019-11-16 00:39:09 +05:00
parent 51da8b9c4d
commit 7e8a2722ac
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
View File

@ -550,6 +550,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
List<UserTokens> userTokens = response.body();
final TinyDB tinyDb = new TinyDB(getApplicationContext());
final AppUtil appUtil = new AppUtil();
//Headers responseHeaders = response.headers();
if (response.isSuccessful()) {
@ -560,13 +561,30 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
assert userTokens != null;
if (userTokens.size() > 0) {
for (int i = 0; i < userTokens.size(); i++) {
if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
setTokenFlag = true;
break;
if(userTokens.get(0).getToken_last_eight() != null) {
for (int i = 0; i < userTokens.size(); i++) {
if (userTokens.get(i).getToken_last_eight().equals(tinyDb.getString(loginUid + "-token-last-eight"))) {
setTokenFlag = true;
break;
}
//Log.i("Tokens: ", userTokens.get(i).getToken_last_eight());
}
//Log.i("Tokens: ", userTokens.get(i).getSha1());
}
else {
for (int i = 0; i < userTokens.size(); i++) {
if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
setTokenFlag = true;
break;
}
//Log.i("Tokens: ", userTokens.get(i).getSha1());
}
}
}
if(tinyDb.getString(loginUid + "-token").isEmpty() || !setTokenFlag) {
@ -605,6 +623,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
tinyDb.remove("loginPass");
tinyDb.putBoolean("loggedInMode", true);
tinyDb.putString(loginUid + "-token", newToken.getSha1());
tinyDb.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8));
//Log.i("Tokens", "new:" + newToken.getSha1() + " old:" + tinyDb.getString(loginUid + "-token"));
startActivity(new Intent(LoginActivity.this, MainActivity.class));

5
app/src/main/java/org/mian/gitnex/models/UserTokens.java
View File

@ -9,6 +9,7 @@ public class UserTokens {
private int id;
private String name;
private String sha1;
private String token_last_eight;
public UserTokens(String name) {
this.name = name;
@ -29,4 +30,8 @@ public class UserTokens {
public void setName(String name) {
this.name = name;
}
public String getToken_last_eight() {
return token_last_eight;
}
}

6
app/src/main/java/org/mian/gitnex/util/AppUtil.java
View File

@ -230,4 +230,10 @@ public class AppUtil {
return Arrays.asList(extValues).contains(ext);
}
public String getLastCharactersOfWord( String str, int count ) {
return str.substring(str.length() - count);
}
}