summaryrefslogtreecommitdiffstats
path: root/app/src/main/java
diff options
context:
space:
mode:
authortom79 <tschneider.ac@gmail.com>2020-04-09 18:57:12 +0200
committertom79 <tschneider.ac@gmail.com>2020-04-09 18:57:12 +0200
commitaf32fad854ecbc781d95b2d001bb02f4441ee720 (patch)
treed47576153ed65e51856979e07efbd39b7f8b7f85 /app/src/main/java
parentfa2c2654da1205b8e855f0f20ac9781434c0eaeb (diff)
Some fixes
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java16
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/HashTagActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/LoginActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java10
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/TagCacheActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/TootActivity.java14
-rw-r--r--app/src/main/java/app/fedilab/android/activities/WebviewActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/DownloadTrackingDomainsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/ManagePlaylistsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/PostActionAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/PostStatusAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RemoveAccountAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveAccountsForReplyAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveChartsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveEmojiAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java14
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveMissingFeedsAsyncTask.java4
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationChartsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationStatsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationsCacheAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrievePeertubeChannelsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveScheduledTootsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveSearchAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/RetrieveStatsAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/SyncBookmarksAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/SyncTimelinesAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java2
-rw-r--r--app/src/main/java/app/fedilab/android/client/API.java18
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java4
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Notification.java1
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Poll.java55
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Status.java2
-rw-r--r--app/src/main/java/app/fedilab/android/client/GNUAPI.java10
-rw-r--r--app/src/main/java/app/fedilab/android/client/PeertubeAPI.java6
-rw-r--r--app/src/main/java/app/fedilab/android/client/PixelfedAPI.java2
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java32
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java16
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java4
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java123
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksPixelfedFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java6
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java5
-rw-r--r--app/src/main/java/app/fedilab/android/helper/CrossActions.java511
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java69
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/BackupNotificationsSyncJob.java2
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/BackupStatusesSyncJob.java2
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java2
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/ScheduledBoostsSyncJob.java6
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/ScheduledTootsSyncJob.java4
-rw-r--r--app/src/main/java/app/fedilab/android/services/BackupNotificationInDataBaseService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/services/BackupStatusInDataBaseService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/services/BackupStatusService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java4
-rw-r--r--app/src/main/java/app/fedilab/android/services/LiveNotificationService.java4
-rw-r--r--app/src/main/java/app/fedilab/android/services/StreamingFederatedTimelineService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/services/StreamingHomeTimelineService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/sqlite/Sqlite.java4
83 files changed, 493 insertions, 585 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index f4d791463..8c18df9cf 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -211,7 +211,7 @@ public abstract class BaseMainActivity extends BaseActivity
userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(BaseMainActivity.this));
- SQLiteDatabase db = Sqlite.getInstance(BaseMainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
Account account = new AccountDAO(BaseMainActivity.this, db).getUniqAccount(userId, instance);
Intent intent = getIntent();
PackageManager pm = getPackageManager();
@@ -1376,7 +1376,7 @@ public abstract class BaseMainActivity extends BaseActivity
DisplayStatusFragment fragment = new DisplayStatusFragment();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.MYVIDEOS);
bundle.putString("instanceType", "PEERTUBE");
- SQLiteDatabase db = Sqlite.getInstance(BaseMainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(BaseMainActivity.this));
@@ -1670,7 +1670,7 @@ public abstract class BaseMainActivity extends BaseActivity
if (dir.isDirectory()) {
Helper.deleteDir(dir);
}
- SQLiteDatabase db = Sqlite.getInstance(contextReference.get(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(contextReference.get().getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
new TimelineCacheDAO(contextReference.get(), db).removeAll();
} catch (Exception ignored) {
}
@@ -1683,7 +1683,7 @@ public abstract class BaseMainActivity extends BaseActivity
if (mPageReferenceMap != null)
mPageReferenceMap = null;
PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("isMainActivityRunning", false).apply();
- if( Sqlite.db != null ) {
+ if (Sqlite.db != null) {
Sqlite.db.close();
}
}
@@ -1813,7 +1813,7 @@ public abstract class BaseMainActivity extends BaseActivity
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.MYVIDEOS);
bundle.putString("instanceType", "PEERTUBE");
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
- SQLiteDatabase db = Sqlite.getInstance(BaseMainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(BaseMainActivity.this));
Account account = new AccountDAO(BaseMainActivity.this, db).getUniqAccount(userId, instance);
@@ -1829,7 +1829,7 @@ public abstract class BaseMainActivity extends BaseActivity
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.PEERTUBE_HISTORY);
bundle.putString("instanceType", "PEERTUBE");
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
- SQLiteDatabase db = Sqlite.getInstance(BaseMainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(BaseMainActivity.this));
Account account = new AccountDAO(BaseMainActivity.this, db).getUniqAccount(userId, instance);
@@ -1970,7 +1970,7 @@ public abstract class BaseMainActivity extends BaseActivity
startActivity(myIntent);
finish();
} else {
- SQLiteDatabase db = Sqlite.getInstance(BaseMainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
Account account = new AccountDAO(BaseMainActivity.this, db).getUniqAccount(userId, instance);
Helper.updateHeaderAccountInfo(activity, account, headerLayout);
}
@@ -2274,7 +2274,7 @@ public abstract class BaseMainActivity extends BaseActivity
}
public void manageTab(RetrieveFeedsAsyncTask.Type type, int value) {
- SQLiteDatabase db = Sqlite.getInstance(BaseMainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
List<ManageTimelines> tls = new TimelinesDAO(BaseMainActivity.this, db).getDisplayedTimelines();
for (ManageTimelines tl : tls) {
if (type == ManageTimelines.transform(BaseMainActivity.this, tl.getType())) {
diff --git a/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java b/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
index 356d07392..a720e1dbc 100644
--- a/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
@@ -114,7 +114,7 @@ public class BookmarkActivity extends BaseActivity implements OnRetrieveFeedsInt
setTitle(R.string.bookmarks);
}
- SQLiteDatabase db = Sqlite.getInstance(BookmarkActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
Account account = new AccountDAO(BookmarkActivity.this, db).getUniqAccount(userId, instance);
diff --git a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
index c0e4af858..c12a187a0 100644
--- a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
@@ -111,7 +111,7 @@ public class CustomSharingActivity extends BaseActivity implements OnCustomShari
} else {
setTitle(R.string.settings_title_custom_sharing);
}
- SQLiteDatabase db = Sqlite.getInstance(CustomSharingActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
Account account = new AccountDAO(CustomSharingActivity.this, db).getUniqAccount(userId, instance);
diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
index da1db0174..03d28c15b 100644
--- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
@@ -138,7 +138,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
} else {
setTitle(R.string.settings_title_profile);
}
- SQLiteDatabase db = Sqlite.getInstance(EditProfileActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
Account account = new AccountDAO(EditProfileActivity.this, db).getUniqAccount(userId, instance);
diff --git a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
index 0ede02e06..07101a079 100644
--- a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
@@ -171,7 +171,7 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
public boolean onCreateOptionsMenu(@NotNull Menu menu) {
getMenuInflater().inflate(R.menu.tag_pin, menu);
- SQLiteDatabase db = Sqlite.getInstance(HashTagActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
List<String> searchInDb = new SearchDAO(HashTagActivity.this, db).getSearchByKeyword(tag.trim());
if (searchInDb != null && searchInDb.size() > 0) {
menu.findItem(R.id.action_pin).setVisible(false);
@@ -186,7 +186,7 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
finish();
return true;
case R.id.action_pin:
- SQLiteDatabase db = Sqlite.getInstance(HashTagActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
new SearchDAO(HashTagActivity.this, db).insertSearch(tag);
Intent intent = new Intent(HashTagActivity.this, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java b/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java
index dc87cf107..6d3f6ae01 100644
--- a/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java
+++ b/