Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Issue #903 - some improvements

This commit is contained in:
tom79 2019-04-26 19:05:09 +02:00
parent 42b250779b
commit 8de1fdaef8
6 changed files with 49 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/SyncTimelinesAsyncTask.java
View File

@ -17,6 +17,7 @@ package fr.gouv.etalab.mastodon.asynctasks;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
@ -27,6 +28,7 @@ import fr.gouv.etalab.mastodon.client.APIResponse;
import fr.gouv.etalab.mastodon.client.Entities.ManageTimelines;
import fr.gouv.etalab.mastodon.client.Entities.RemoteInstance;
import fr.gouv.etalab.mastodon.client.Entities.TagTimeline;
import fr.gouv.etalab.mastodon.helper.Helper;
import fr.gouv.etalab.mastodon.interfaces.OnSyncTimelineInterface;
import fr.gouv.etalab.mastodon.sqlite.InstancesDAO;
import fr.gouv.etalab.mastodon.sqlite.SearchDAO;

1
app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
View File

@ -1594,6 +1594,7 @@ public class API {
statuses = parseStatuses(context, new JSONArray(response));
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (IOException e) {

78
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/ManageTimelines.java
View File

@ -385,7 +385,6 @@ public class ManageTimelines {
});
}
}else if( tl.getType() == Type.TAG) {
if(tabStrip != null)
if( tabStrip != null && tabStrip.getChildCount() > position) {
int finalPosition = position;
tabStrip.getChildAt(position).setOnLongClickListener(new View.OnLongClickListener() {
@ -746,13 +745,13 @@ public class ManageTimelines {
style = R.style.Dialog;
}
String tag;
TagTimeline tagtl = tl.getTagTimeline();
if( tagtl == null)
tagTimeline = tl.getTagTimeline();
if( tagTimeline == null)
return;
if( tagtl.getDisplayname() != null)
tag = tagtl.getDisplayname();
if( tagTimeline.getDisplayname() != null)
tag = tagTimeline.getDisplayname();
else
tag = tagtl.getName();
tag = tagTimeline.getName();
popup.getMenuInflater()
.inflate(R.menu.option_tag_timeline, popup.getMenu());
Menu menu = popup.getMenu();
@ -765,19 +764,18 @@ public class ManageTimelines {
final boolean[] changes = {false};
final boolean[] mediaOnly = {false};
final boolean[] showNSFW = {false};
mediaOnly[0] = tagtl.isART();
showNSFW[0] = tagtl.isNSFW();
mediaOnly[0] = tagTimeline.isART();
showNSFW[0] = tagTimeline.isNSFW();
itemMediaOnly.setChecked(mediaOnly[0]);
itemShowNSFW.setChecked(showNSFW[0]);
popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
@Override
public void onDismiss(PopupMenu menu) {
if(changes[0]) {
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
FragmentTransaction fragTransaction = ((MainActivity)context).getSupportFragmentManager().beginTransaction();
DisplayStatusFragment displayStatusFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition());
assert displayStatusFragment != null;
if( displayStatusFragment == null)
return;
fragTransaction.detach(displayStatusFragment);
Bundle bundle = new Bundle();
bundle.putString("tag", tag);
@ -813,26 +811,20 @@ public class ManageTimelines {
changes[0] = true;
switch (item.getItemId()) {
case R.id.action_show_media_only:
TagTimeline tagTimeline = new TagTimeline();
mediaOnly[0] =!mediaOnly[0];
tagTimeline.setName(tag.trim());
tagTimeline.setART(mediaOnly[0]);
tagTimeline.setNSFW(showNSFW[0]);
itemMediaOnly.setChecked(mediaOnly[0]);
new SearchDAO(context, db).updateSearch(tagTimeline, null,null, null, null);
new SearchDAO(context, db).updateSearch(tagTimeline);
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
itemMediaOnly.setChecked(mediaOnly[0]);
new TimelinesDAO(context, db).updateTag(tl);
break;
case R.id.action_show_nsfw:
showNSFW[0] = !showNSFW[0];
tagTimeline = new TagTimeline();
tagTimeline.setName(tag.trim());
tagTimeline.setART(mediaOnly[0]);
tagTimeline.setNSFW(showNSFW[0]);
itemShowNSFW.setChecked(showNSFW[0]);
new SearchDAO(context, db).updateSearch(tagTimeline, null,null, null, null);
new SearchDAO(context, db).updateSearch(tagTimeline);
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
itemShowNSFW.setChecked(showNSFW[0]);
new TimelinesDAO(context, db).updateTag(tl);
break;
case R.id.action_any:
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, style);
@ -848,21 +840,16 @@ public class ManageTimelines {
editText.setText(valuesTag);
editText.setSelection(editText.getText().toString().length());
}
tagTimeline = new TagTimeline();
tagTimeline.setName(tag.trim());
tagTimeline.setART(mediaOnly[0]);
tagTimeline.setNSFW(showNSFW[0]);
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
String[] values = editText.getText().toString().trim().split("\\s+");
java.util.List<String> any =
new ArrayList<>(Arrays.asList(values));
new SearchDAO(context, db).updateSearch(tagTimeline,null, any, null, null);
tagTimeline.setAny(any);
new SearchDAO(context, db).updateSearch(tagTimeline);
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
new TimelinesDAO(context, db).updateTag(tl);
}
});
AlertDialog alertDialog = dialogBuilder.create();
@ -882,20 +869,16 @@ public class ManageTimelines {
editTextAll.setText(valuesTag);
editTextAll.setSelection(editTextAll.getText().toString().length());
}
tagTimeline = new TagTimeline();
tagTimeline.setName(tag.trim());
tagTimeline.setART(mediaOnly[0]);
tagTimeline.setNSFW(showNSFW[0]);
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
String[] values = editTextAll.getText().toString().trim().split("\\s+");
java.util.List<String> all =
new ArrayList<>(Arrays.asList(values));
new SearchDAO(context, db).updateSearch(tagTimeline, null,null, all, null);
tagTimeline.setAll(all);
new SearchDAO(context, db).updateSearch(tagTimeline);
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
new TimelinesDAO(context, db).updateTag(tl);
}
});
alertDialog = dialogBuilder.create();
@ -915,20 +898,16 @@ public class ManageTimelines {
editTextNone.setText(valuesTag);
editTextNone.setSelection(editTextNone.getText().toString().length());
}
tagTimeline = new TagTimeline();
tagTimeline.setName(tag.trim());
tagTimeline.setART(mediaOnly[0]);
tagTimeline.setNSFW(showNSFW[0]);
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
String[] values = editTextNone.getText().toString().trim().split("\\s+");
java.util.List<String> none =
new ArrayList<>(Arrays.asList(values));
new SearchDAO(context, db).updateSearch(tagTimeline, null,null, null, none);
tagTimeline.setNone(none);
new SearchDAO(context, db).updateSearch(tagTimeline);
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
new TimelinesDAO(context, db).updateTag(tl);
}
});
alertDialog = dialogBuilder.create();
@ -945,10 +924,6 @@ public class ManageTimelines {
editTextName.setText(tagInfo.get(0).getDisplayname());
editTextName.setSelection(editTextName.getText().toString().length());
}
tagTimeline = new TagTimeline();
tagTimeline.setName(tag.trim());
tagTimeline.setART(mediaOnly[0]);
tagTimeline.setNSFW(showNSFW[0]);
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
@ -957,9 +932,10 @@ public class ManageTimelines {
values = tag;
if( tabLayout.getTabAt(position) != null)
tabLayout.getTabAt(position).setText(values);
new SearchDAO(context, db).updateSearch(tagTimeline, values,null, null, null);
tagTimeline.setDisplayname(values);
new SearchDAO(context, db).updateSearch(tagTimeline);
tl.setTagTimeline(tagTimeline);
new TimelinesDAO(context, db).update(tl);
new TimelinesDAO(context, db).updateTag(tl);
}
});
alertDialog = dialogBuilder.create();

1
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -163,6 +163,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
timelineId = bundle.getInt("timelineId");
}
if( ischannel)
type = RetrieveFeedsAsyncTask.Type.CHANNEL;

11
app/src/main/java/fr/gouv/etalab/mastodon/sqlite/SearchDAO.java
View File

@ -75,20 +75,23 @@ public class SearchDAO {
* update tag timeline info in database
* @param tagTimeline TagTimeline
*/
public void updateSearch(TagTimeline tagTimeline, String name, List<String> any, List<String> all, List<String> none) {
public void updateSearch(TagTimeline tagTimeline) {
ContentValues values = new ContentValues();
values.put(Sqlite.COL_IS_ART, tagTimeline.isART()?1:0);
values.put(Sqlite.COL_IS_NSFW, tagTimeline.isNSFW()?1:0);
List<String> any = tagTimeline.getAny();
List<String> all = tagTimeline.getAll();
List<String> none = tagTimeline.getNone();
String displayname = tagTimeline.getDisplayname();
values.put(Sqlite.COL_NAME, displayname);
if( any != null && any.size() > 0)
values.put(Sqlite.COL_ANY, Helper.arrayToStringStorage(any));
if( all != null && all.size() > 0)
values.put(Sqlite.COL_ALL, Helper.arrayToStringStorage(all));
if( none != null && none.size() > 0)
values.put(Sqlite.COL_NONE, Helper.arrayToStringStorage(none));
if( name != null && name.trim().length() > 0)
values.put(Sqlite.COL_NAME, name.trim());
try{
db.update(Sqlite.TABLE_SEARCH, values, Sqlite.COL_USER_ID + " = ? AND " + Sqlite.COL_KEYWORDS + " = ?", new String[]{userId, tagTimeline.getName()});
db.update(Sqlite.TABLE_SEARCH, values, Sqlite.COL_ID + " = ? ", new String[]{String.valueOf(tagTimeline.getId())});
}catch (Exception ignored) {}
}

16
app/src/main/java/fr/gouv/etalab/mastodon/sqlite/TimelinesDAO.java
View File

@ -78,13 +78,19 @@ public class TimelinesDAO {
ContentValues values = new ContentValues();
values.put(Sqlite.COL_DISPLAYED, timeline.isDisplayed());
values.put(Sqlite.COL_POSITION, timeline.getPosition());
return db.update(Sqlite.TABLE_TIMELINES,
values, Sqlite.COL_ID + " = ? ",
new String[]{String.valueOf(timeline.getId())});
}
//------- UPDATE -------
public void updateTag(ManageTimelines timeline) {
ContentValues values = new ContentValues();
values.put(Sqlite.COL_DISPLAYED, timeline.isDisplayed());
if( timeline.getTagTimeline() != null)
values.put(Sqlite.COL_TAG_TIMELINE, Helper.tagTimelineToStringStorage(timeline.getTagTimeline()));
if( timeline.getRemoteInstance() != null)
values.put(Sqlite.COL_REMOTE_INSTANCE, Helper.remoteInstanceToStringStorage(timeline.getRemoteInstance()));
if( timeline.getListTimeline() != null)
values.put(Sqlite.COL_LIST_TIMELINE, Helper.listTimelineToStringStorage(timeline.getListTimeline()));
return db.update(Sqlite.TABLE_TIMELINES,
db.update(Sqlite.TABLE_TIMELINES,
values, Sqlite.COL_ID + " = ? ",
new String[]{String.valueOf(timeline.getId())});
}