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

bug fix

This commit is contained in:
NudeDude 2019-05-05 17:43:07 +02:00
parent 8c05980ab6
commit 1a4c2cf7e2
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -24,6 +24,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
minifyEnabled false
applicationIdSuffix ".debug"
versionNameSuffix '.DEBUG'
}

14
app/src/main/java/org/nuclearfog/twidda/backend/ImageLoader.java
View File

@ -14,6 +14,7 @@ import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.adapter.ImageAdapter;
import org.nuclearfog.twidda.window.ImageDetail;
import java.io.InputStream;
import java.lang.ref.WeakReference;
import java.net.URL;
@ -35,14 +36,17 @@ public class ImageLoader extends AsyncTask<String, Void, Boolean> {
@Override
protected Boolean doInBackground(String... links) {
try {
int i = 0;
images = new Bitmap[links.length];
for (int i = 0; i < links.length; i++) {
String link = links[i];
for (String link : links) {
if (link.startsWith("/"))
images[i] = BitmapFactory.decodeFile(link);
else
images[i] = BitmapFactory.decodeStream(new URL(link).openStream());
images[i++] = BitmapFactory.decodeFile(link);
else {
URL u = new URL(link);
InputStream stream = u.openStream();
images[i++] = BitmapFactory.decodeStream(stream);
}
}
} catch (Exception err) {
if (err.getMessage() != null)

8
app/src/main/java/org/nuclearfog/twidda/fragment/MessageListFragment.java
View File

@ -33,16 +33,16 @@ public class MessageListFragment extends Fragment implements OnRefreshListener,
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup parent, Bundle param) {
GlobalSettings settings = GlobalSettings.getInstance(getContext());
View v = inflater.inflate(R.layout.fragment_list, parent, false);
RecyclerView list = v.findViewById(R.id.fragment_list);
reload = v.findViewById(R.id.fragment_reload);
GlobalSettings settings = GlobalSettings.getInstance(getContext());
reload.setProgressBackgroundColorSchemeColor(settings.getHighlightColor());
reload.setOnRefreshListener(this);
MessageAdapter adapter = new MessageAdapter(this);
adapter.setColor(settings.getHighlightColor(), settings.getFontColor());
adapter.toggleImage(settings.getImageLoad());
reload.setProgressBackgroundColorSchemeColor(settings.getHighlightColor());
list.setLayoutManager(new LinearLayoutManager(getContext()));
list.setHasFixedSize(true);
list.setAdapter(adapter);
@ -61,7 +61,7 @@ public class MessageListFragment extends Fragment implements OnRefreshListener,
public void onStart() {
super.onStart();
if (messageTask == null) {
messageTask = new MessageLoader(root, Mode.LOAD);
messageTask = new MessageLoader(root, Mode.DB);
messageTask.execute();
}
}

6
app/src/main/java/org/nuclearfog/twidda/fragment/backend/MessageLoader.java
View File

@ -24,6 +24,7 @@ public class MessageLoader extends AsyncTask<Long, Void, Boolean> {
public enum Mode {
DB,
LOAD,
DEL
}
@ -67,6 +68,11 @@ public class MessageLoader extends AsyncTask<Long, Void, Boolean> {
long messageId = 0;
try {
switch (mode) {
case DB:
messages = db.getMessages();
if (!messages.isEmpty())
break;
case LOAD:
messages = mTwitter.getMessages();
db.storeMessage(messages);

2
app/src/main/java/org/nuclearfog/twidda/fragment/backend/UserLoader.java
View File

@ -14,6 +14,7 @@ import org.nuclearfog.twidda.backend.TwitterEngine;
import org.nuclearfog.twidda.backend.items.TwitterUser;
import java.lang.ref.WeakReference;
import java.util.LinkedList;
import java.util.List;
import twitter4j.TwitterException;
@ -77,6 +78,7 @@ public class UserLoader extends AsyncTask<Object, Void, Boolean> {
break;
case FAVORIT:
users = new LinkedList<>(); // TODO not jet implemented in Twitter4J
break;
case SEARCH: