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

version upgrade, bug fix

This commit is contained in:
nuclearfog 2023-06-13 20:57:45 +02:00
parent 883bd8246f
commit d902704c09
No known key found for this signature in database
GPG Key ID: 03488A185C476379
10 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -11,8 +11,8 @@ android {
applicationId 'org.nuclearfog.twidda' applicationId 'org.nuclearfog.twidda'
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
versionCode 87 versionCode 88
versionName '3.2' versionName '3.2.1'
resConfigs 'en', 'de-rDE', 'zh-rCN' resConfigs 'en', 'de-rDE', 'zh-rCN'
} }

10
app/src/main/java/org/nuclearfog/twidda/ClientApplication.java
View File

@ -1,14 +1,10 @@
package org.nuclearfog.twidda; package org.nuclearfog.twidda;
import android.app.Application; import android.app.Application;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.os.Build;
import org.nuclearfog.twidda.backend.image.ImageCache; import org.nuclearfog.twidda.backend.image.ImageCache;
import org.nuclearfog.twidda.backend.image.PicassoBuilder; import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings; import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.notification.PushNotification;
import org.nuclearfog.twidda.notification.PushSubscription; import org.nuclearfog.twidda.notification.PushSubscription;
/** /**
@ -24,12 +20,6 @@ public class ClientApplication extends Application {
super.onCreate(); super.onCreate();
// setup push receiver // setup push receiver
settings = GlobalSettings.getInstance(getApplicationContext()); settings = GlobalSettings.getInstance(getApplicationContext());
// setup notification channel
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager manager = getSystemService(NotificationManager.class);
NotificationChannel channel = new NotificationChannel(PushNotification.NOTIFICATION_ID_STR, PushNotification.NOTIFICATION_NAME, NotificationManager.IMPORTANCE_HIGH);
manager.createNotificationChannel(channel);
}
if (settings.isLoggedIn() && settings.pushEnabled()) { if (settings.isLoggedIn() && settings.pushEnabled()) {
PushSubscription.subscripe(getApplicationContext()); PushSubscription.subscripe(getApplicationContext());
} }

2
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonStatus.java
View File

@ -100,7 +100,7 @@ public class MastodonStatus implements Status {
jsoupDoc.select("p").before("\\n"); jsoupDoc.select("p").before("\\n");
String str = jsoupDoc.html().replace("\\n", "\n"); String str = jsoupDoc.html().replace("\\n", "\n");
text = Jsoup.clean(str, "", Safelist.none(), OUTPUT_SETTINGS); text = Jsoup.clean(str, "", Safelist.none(), OUTPUT_SETTINGS);
text = text.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&"); text = text.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&").replace("&nbsp;", "\u00A0");
if (text.startsWith("\n")) { if (text.startsWith("\n")) {
text = text.substring(1); text = text.substring(1);
} }

9
app/src/main/java/org/nuclearfog/twidda/config/Configuration.java
View File

@ -27,11 +27,6 @@ public enum Configuration {
*/ */
MASTODON(Account.API_MASTODON); MASTODON(Account.API_MASTODON);
/**
* fallback configuration to use when there is no network selected
*/
public static final Configuration FALLBACK_CONFIG = MASTODON;
private final String name; private final String name;
private final int accountType; private final int accountType;
private final boolean userlistExtended; private final boolean userlistExtended;
@ -73,7 +68,7 @@ public enum Configuration {
emojiSupported = false; emojiSupported = false;
statusEditSupported = false; statusEditSupported = false;
webpushSupported = false; webpushSupported = false;
arrayResHome = R.array.home_twitter_icons; arrayResHome = R.array.home_twitter_tab_icons;
break; break;
default: default:
@ -93,7 +88,7 @@ public enum Configuration {
emojiSupported = true; emojiSupported = true;
statusEditSupported = true; statusEditSupported = true;
webpushSupported = true; webpushSupported = true;
arrayResHome = R.array.home_mastodon_icons; arrayResHome = R.array.home_mastodon_tab_icons;
break; break;
} }
} }

16
app/src/main/java/org/nuclearfog/twidda/config/impl/ConfigAccount.java
View File

@ -18,7 +18,7 @@ public class ConfigAccount implements Account {
private long id; private long id;
private long timestamp; private long timestamp;
private int type; private int apiType;
private String oauthToken, tokenSecret, bearerToken; private String oauthToken, tokenSecret, bearerToken;
private String consumerToken, consumerSecret, hostname; private String consumerToken, consumerSecret, hostname;
@ -36,15 +36,15 @@ public class ConfigAccount implements Account {
switch (account.getConfiguration()) { switch (account.getConfiguration()) {
case TWITTER1: case TWITTER1:
type = API_TWITTER_1; apiType = API_TWITTER_1;
break; break;
case TWITTER2: case TWITTER2:
type = API_TWITTER_2; apiType = API_TWITTER_2;
break; break;
case MASTODON: case MASTODON:
type = API_MASTODON; apiType = API_MASTODON;
break; break;
} }
} }
@ -52,7 +52,7 @@ public class ConfigAccount implements Account {
/** /**
* *
*/ */
public ConfigAccount(long id, String oauthToken, String tokenSecret, String consumerToken, String consumerSecret, String bearerToken, String hostname, int type) { public ConfigAccount(long id, String oauthToken, String tokenSecret, String consumerToken, String consumerSecret, String bearerToken, String hostname, int apiType) {
this.id = id; this.id = id;
this.oauthToken = oauthToken; this.oauthToken = oauthToken;
this.tokenSecret = tokenSecret; this.tokenSecret = tokenSecret;
@ -60,7 +60,7 @@ public class ConfigAccount implements Account {
this.consumerSecret = consumerSecret; this.consumerSecret = consumerSecret;
this.bearerToken = bearerToken; this.bearerToken = bearerToken;
this.hostname = hostname; this.hostname = hostname;
this.type = type; this.apiType = apiType;
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
@ -122,7 +122,7 @@ public class ConfigAccount implements Account {
@Override @Override
public Configuration getConfiguration() { public Configuration getConfiguration() {
switch (type) { switch (apiType) {
case API_TWITTER_1: case API_TWITTER_1:
return Configuration.TWITTER1; return Configuration.TWITTER1;
@ -133,7 +133,7 @@ public class ConfigAccount implements Account {
return Configuration.MASTODON; return Configuration.MASTODON;
default: default:
return Configuration.FALLBACK_CONFIG; throw new RuntimeException("wrong API type: " + apiType);
} }
} }

2
app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseAccount.java
View File

@ -132,7 +132,7 @@ public class DatabaseAccount implements Account, AccountTable {
return Configuration.MASTODON; return Configuration.MASTODON;
default: default:
return Configuration.FALLBACK_CONFIG; throw new RuntimeException("wrong API type: " + apiType);
} }
} }

10
app/src/main/java/org/nuclearfog/twidda/notification/PushNotification.java
View File

@ -2,6 +2,8 @@ package org.nuclearfog.twidda.notification;
import static android.Manifest.permission.POST_NOTIFICATIONS; import static android.Manifest.permission.POST_NOTIFICATIONS;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -39,10 +41,16 @@ public class PushNotification {
* *
*/ */
public PushNotification(Context context) { public PushNotification(Context context) {
this.context = context;
notificationManager = NotificationManagerCompat.from(context); notificationManager = NotificationManagerCompat.from(context);
notificationBuilder = new NotificationCompat.Builder(context, NOTIFICATION_ID_STR); notificationBuilder = new NotificationCompat.Builder(context, NOTIFICATION_ID_STR);
settings = GlobalSettings.getInstance(context); settings = GlobalSettings.getInstance(context);
this.context = context; // setup notification channel
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager manager = context.getSystemService(NotificationManager.class);
NotificationChannel channel = new NotificationChannel(PushNotification.NOTIFICATION_ID_STR, PushNotification.NOTIFICATION_NAME, NotificationManager.IMPORTANCE_HIGH);
manager.createNotificationChannel(channel);
}
// Open MainActivity and select notification tab, if notification view is clicked // Open MainActivity and select notification tab, if notification view is clicked
Intent notificationIntent = new Intent(context.getApplicationContext(), MainActivity.class); Intent notificationIntent = new Intent(context.getApplicationContext(), MainActivity.class);
notificationIntent.putExtra(MainActivity.KEY_SELECT_NOTIFICATION, true); notificationIntent.putExtra(MainActivity.KEY_SELECT_NOTIFICATION, true);

2
app/src/main/java/org/nuclearfog/twidda/notification/PushNotificationReceiver.java
View File

@ -26,7 +26,7 @@ public class PushNotificationReceiver extends MessagingReceiver implements Async
@Override @Override
public void onMessage(@NonNull Context context, @NonNull byte[] message, @NonNull String instance) { public void onMessage(@NonNull Context context, @NonNull byte[] message, @NonNull String instance) {
GlobalSettings settings = GlobalSettings.getInstance(context); GlobalSettings settings = GlobalSettings.getInstance(context);
if (settings.pushEnabled()) { if (settings.isLoggedIn() && settings.getLogin().getConfiguration().isWebpushSupported() && settings.pushEnabled()) {
NotificationLoader loader = new NotificationLoader(context); NotificationLoader loader = new NotificationLoader(context);
NotificationLoaderParam param = new NotificationLoaderParam(NotificationLoaderParam.LOAD_UNREAD, 0, 0L, 0L); NotificationLoaderParam param = new NotificationLoaderParam(NotificationLoaderParam.LOAD_UNREAD, 0, 0L, 0L);
notificationManager = new PushNotification(context); notificationManager = new PushNotification(context);

4
app/src/main/java/org/nuclearfog/twidda/ui/activities/SettingsActivity.java
View File

@ -210,6 +210,10 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
enableLocalTl.setVisibility(View.VISIBLE); enableLocalTl.setVisibility(View.VISIBLE);
trend_card.setVisibility(View.GONE); trend_card.setVisibility(View.GONE);
} }
if (!configuration.isWebpushSupported()) {
push_label.setVisibility(View.GONE);
enablePush.setVisibility(View.GONE);
}
if (!settings.isLoggedIn()) { if (!settings.isLoggedIn()) {
user_card.setVisibility(View.GONE); user_card.setVisibility(View.GONE);
push_label.setVisibility(View.GONE); push_label.setVisibility(View.GONE);

4
app/src/main/res/values/arrays.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<integer-array name="home_twitter_icons"> <integer-array name="home_twitter_tab_icons">
<item>@drawable/home</item> <item>@drawable/home</item>
<item>@drawable/hash</item> <item>@drawable/hash</item>
<item>@drawable/bell</item> <item>@drawable/bell</item>
<item>@drawable/message</item> <item>@drawable/message</item>
</integer-array> </integer-array>
<integer-array name="home_mastodon_icons"> <integer-array name="home_mastodon_tab_icons">
<item>@drawable/home</item> <item>@drawable/home</item>
<item>@drawable/hash</item> <item>@drawable/hash</item>
<item>@drawable/global</item> <item>@drawable/global</item>