Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #933 from likeazir/fix-sql-substr-index 

fix sql strings are indexed at 1
This commit is contained in:
Gregory K 2024-11-18 00:52:42 +03:00 committed by GitHub
parent ad2f4791c2 af8c071b4a
commit 85fd88337e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
View File

@ -384,7 +384,7 @@ public class AccountSessionManager{
private void readInstanceInfo(SQLiteDatabase db, Set<String> domains){ private void readInstanceInfo(SQLiteDatabase db, Set<String> domains){
for(String domain : domains){ for(String domain : domains){
final int maxEmojiLength=500000; final int maxEmojiLength=500000;
try(Cursor cursor=db.rawQuery("SELECT domain, instance_obj, substring(emojis,0,?) AS emojis, length(emojis) AS emoji_length, last_updated, version FROM instances WHERE `domain` = ?", try(Cursor cursor=db.rawQuery("SELECT domain, instance_obj, substr(emojis,1,?) AS emojis, length(emojis) AS emoji_length, last_updated, version FROM instances WHERE `domain` = ?",
new String[]{String.valueOf(maxEmojiLength) , domain})) { new String[]{String.valueOf(maxEmojiLength) , domain})) {
ContentValues values=new ContentValues(); ContentValues values=new ContentValues();
while(cursor.moveToNext()){ while(cursor.moveToNext()){
@ -407,7 +407,7 @@ public class AccountSessionManager{
int emojiStringLength=values.getAsInteger("emoji_length"); int emojiStringLength=values.getAsInteger("emoji_length");
if(emojiStringLength>maxEmojiLength){ if(emojiStringLength>maxEmojiLength){
final int pagesize=1000000; final int pagesize=1000000;
for(int start=maxEmojiLength; start<emojiStringLength; start+=pagesize){ for(int start=maxEmojiLength + 1; start<=emojiStringLength; start+=pagesize){
try(Cursor emojiCursor=db.rawQuery("SELECT substr(emojis,?, ?) FROM instances WHERE `domain` = ?", new String[]{String.valueOf(start), String.valueOf(pagesize), domain})){ try(Cursor emojiCursor=db.rawQuery("SELECT substr(emojis,?, ?) FROM instances WHERE `domain` = ?", new String[]{String.valueOf(start), String.valueOf(pagesize), domain})){
emojiCursor.moveToNext(); emojiCursor.moveToNext();
emojiSB.append(emojiCursor.getString(0)); emojiSB.append(emojiCursor.getString(0));