mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-02-07 07:04:44 +01:00
Compare commits
No commits in common. "6d6a79bcb69026046692851bf9a5680c40337dd1" and "741ec08386de837930cb834a86f802a5fd3ff6fb" have entirely different histories.
6d6a79bcb6
...
741ec08386
@ -21,8 +21,8 @@ android {
|
|||||||
applicationId "eu.toldi.infinityforlemmy"
|
applicationId "eu.toldi.infinityforlemmy"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 33
|
targetSdk 33
|
||||||
versionCode 131
|
versionCode 130
|
||||||
versionName "0.1.2"
|
versionName "0.1.1"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
javaCompileOptions {
|
javaCompileOptions {
|
||||||
annotationProcessorOptions {
|
annotationProcessorOptions {
|
||||||
@ -101,7 +101,7 @@ android {
|
|||||||
|
|
||||||
|
|
||||||
task rearrangeClass(type: Exec) {
|
task rearrangeClass(type: Exec) {
|
||||||
commandLine 'python3', '../scripts/fixEventBus.py'
|
commandLine 'python', '../scripts/fixEventBus.py'
|
||||||
}
|
}
|
||||||
|
|
||||||
applicationVariants.all { variant ->
|
applicationVariants.all { variant ->
|
||||||
|
@ -336,8 +336,9 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
|
|||||||
fragmentManager = getSupportFragmentManager();
|
fragmentManager = getSupportFragmentManager();
|
||||||
|
|
||||||
mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
|
mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
|
||||||
mRetrofit.setAccessToken(mAccessToken);
|
if (mCurrentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true)) {
|
||||||
|
mRetrofit.setAccessToken(mAccessToken);
|
||||||
|
}
|
||||||
|
|
||||||
mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
|
mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
|
||||||
mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
|
mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
|
||||||
|
@ -49,7 +49,7 @@ public class InsertSubscribedThings {
|
|||||||
|
|
||||||
for (SubscribedSubredditData s : subscribedSubredditDataList) {
|
for (SubscribedSubredditData s : subscribedSubredditDataList) {
|
||||||
if (existingSubscribedSubredditDataList.contains(s)) {
|
if (existingSubscribedSubredditDataList.contains(s)) {
|
||||||
subscribedSubredditDao.updateSubscribedSubreddit(s.getQualified_name(), s.getName(), s.getIconUrl(), accountName);
|
subscribedSubredditDao.updateSubscribedSubreddit(s.getQualified_name(), s.getName(), s.getIconUrl());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
subscribedSubredditDao.insert(s);
|
subscribedSubredditDao.insert(s);
|
||||||
|
@ -37,6 +37,6 @@ public interface SubscribedSubredditDao {
|
|||||||
@Query("SELECT * from subscribed_subreddits WHERE username = :qualified_name AND name LIKE '%' || :searchQuery || '%' COLLATE NOCASE AND is_favorite = 1 ORDER BY name COLLATE NOCASE ASC")
|
@Query("SELECT * from subscribed_subreddits WHERE username = :qualified_name AND name LIKE '%' || :searchQuery || '%' COLLATE NOCASE AND is_favorite = 1 ORDER BY name COLLATE NOCASE ASC")
|
||||||
LiveData<List<SubscribedSubredditData>> getAllFavoriteSubscribedSubredditsWithSearchQuery(String qualified_name, String searchQuery);
|
LiveData<List<SubscribedSubredditData>> getAllFavoriteSubscribedSubredditsWithSearchQuery(String qualified_name, String searchQuery);
|
||||||
|
|
||||||
@Query("UPDATE subscribed_subreddits SET name = :displayName, icon = :icon WHERE qualified_name = :qualified_name AND username = :accountName COLLATE NOCASE")
|
@Query("UPDATE subscribed_subreddits SET name = :displayName, icon = :icon WHERE qualified_name = :qualified_name")
|
||||||
void updateSubscribedSubreddit(String qualified_name, String displayName, String icon, String accountName);
|
void updateSubscribedSubreddit(String qualified_name, String displayName, String icon);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user