Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-01-30 10:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
NudeDude 2019-10-08 21:14:53 +02:00
parent 99b9c57097
commit 589379f132
4 changed files with 141 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
.idea/codeStyles/Project.xml generated Normal file
View File

@ -0,0 +1,116 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme>
</component>

6
.idea/inspectionProfiles/Project_Default.xml generated Normal file
View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

9
.idea/modules.xml generated Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Shitter.iml" filepath="$PROJECT_DIR$/.idea/Shitter.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
</project>

19
app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java
View File

@ -31,16 +31,16 @@ public class AppDatabase {
private static final int FRQ_MASK = 1 << 2; // USER REQUEST FOLLOW
private static final int EXCL_USR = 1 << 3; // EXCLUDE USERS TWEETS
private final String limit; // DATABASE ENTRY limit
private final int limit; // DATABASE ENTRY limit
private final long homeId;
private DatabaseAdapter dataHelper;
private long homeId;
public AppDatabase(Context context) {
dataHelper = DatabaseAdapter.getInstance(context);
GlobalSettings settings = GlobalSettings.getInstance(context);
homeId = settings.getUserId();
limit = Integer.toString(settings.getRowLimit());
limit = settings.getRowLimit();
}
/**
@ -183,7 +183,7 @@ public class AppDatabase {
* @return tweet list
*/
public List<Tweet> getHomeTimeline() {
final String[] ARGS = new String[]{Integer.toString(HOM_MASK), limit};
final String[] ARGS = new String[]{Integer.toString(HOM_MASK), Integer.toString(limit)};
final String QUERY = "SELECT * FROM tweet INNER JOIN user ON tweet.userID=user.userID " +
"WHERE statusregister&? IS NOT 0 ORDER BY tweetID DESC LIMIT ?";
@ -207,7 +207,7 @@ public class AppDatabase {
* @return tweet list
*/
public List<Tweet> getMentions() {
final String[] ARGS = new String[]{Integer.toString(MEN_MASK), Integer.toString(EXCL_USR), limit};
final String[] ARGS = new String[]{Integer.toString(MEN_MASK), Integer.toString(EXCL_USR), Integer.toString(limit)};
final String QUERY = "SELECT * FROM tweet INNER JOIN user ON tweet.userID=user.userID " +
"WHERE statusregister&? IS NOT 0 AND userregister&? IS 0 ORDER BY tweetID DESC LIMIT ?";
@ -232,7 +232,7 @@ public class AppDatabase {
* @return Tweet list of user tweets
*/
public List<Tweet> getUserTweets(long userID) {
final String[] ARGS = new String[]{Integer.toString(UTW_MASK), Long.toString(userID), limit};
final String[] ARGS = new String[]{Integer.toString(UTW_MASK), Long.toString(userID), Integer.toString(limit)};
final String QUERY = "SELECT * FROM tweet INNER JOIN user ON tweet.userID=user.userID " +
"WHERE statusregister&? IS NOT 0 AND user.userID=? ORDER BY tweetID DESC LIMIT ?";
@ -257,7 +257,7 @@ public class AppDatabase {
* @return favored tweets by user
*/
public List<Tweet> getUserFavs(long ownerID) {
final String[] ARGS = new String[]{Long.toString(ownerID), limit};
final String[] ARGS = new String[]{Long.toString(ownerID), Integer.toString(limit)};
final String QUERY = "SELECT * FROM tweet INNER JOIN favorit on tweet.tweetID=favorit.tweetID " +
"INNER JOIN user ON tweet.userID=user.userID WHERE favorit.ownerID=? ORDER BY tweetID DESC LIMIT ?";
@ -304,7 +304,8 @@ public class AppDatabase {
* @return list of tweet answers
*/
public List<Tweet> getAnswers(long tweetId) {
final String[] ARGS = new String[]{Long.toString(tweetId), Integer.toString(RPL_MASK), Integer.toString(EXCL_USR), limit};
final String[] ARGS = new String[]{Long.toString(tweetId), Integer.toString(RPL_MASK),
Integer.toString(EXCL_USR), Integer.toString(limit)};
final String QUERY = "SELECT * FROM tweet INNER JOIN user ON tweet.userID=user.userID " +
"WHERE tweet.replyID=? AND statusregister&? IS NOT 0 AND userregister&? IS 0 ORDER BY tweetID DESC LIMIT ?";
@ -456,7 +457,7 @@ public class AppDatabase {
* @return list of direct messages
*/
public List<Message> getMessages() {
final String[] ARGS = new String[]{limit};
final String[] ARGS = new String[]{Integer.toString(limit)};
final String QUERY = "SELECT * FROM message ORDER BY messageID DESC LIMIT ?";
List<Message> result = new LinkedList<>();