diff --git a/app/.gitignore b/app/.gitignore index 61e52b441..3f1ce47a1 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,3 +1,2 @@ /build app-release.apk -app-google-release.apk diff --git a/app/build.gradle b/app/build.gradle index 3248afb32..fca0b292e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,19 +7,11 @@ android { applicationId "com.keylesspalace.tusky" minSdkVersion 15 targetSdkVersion 25 - versionCode 16 - versionName "1.1.3" + versionCode 17 + versionName "1.1.4-beta.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary true } - productFlavors { - google { - buildConfigField "boolean", "USES_PUSH_NOTIFICATIONS", "true" - } - fdroid { - buildConfigField "boolean", "USES_PUSH_NOTIFICATIONS", "false" - } - } buildTypes { release { minifyEnabled true @@ -53,17 +45,16 @@ dependencies { compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' compile 'com.pkmmte.view:circularimageview:1.1' compile 'com.github.varunest:sparkbutton:1.0.5' - compile 'com.mikhaellopez:circularfillableloaders:1.2.0' compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar' compile 'com.github.arimorty:floatingsearchview:2.0.4' compile 'com.theartofdev.edmodo:android-image-cropper:2.4.3' compile 'com.jakewharton:butterknife:8.5.1' compile 'org.jsoup:jsoup:1.10.2' - googleCompile 'com.google.firebase:firebase-messaging:10.2.4' - googleCompile 'com.google.firebase:firebase-crash:10.2.4' + compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0' + compile('org.eclipse.paho:org.eclipse.paho.android.service:1.1.1') { + exclude module: 'support-v4' + } testCompile 'junit:junit:4.12' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' } - -apply plugin: 'com.google.gms.google-services' diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index bfd19f883..000000000 --- a/app/google-services.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "project_info": { - "project_number": "268851337880", - "firebase_url": "https://tusky-62772.firebaseio.com", - "project_id": "tusky-62772", - "storage_bucket": "tusky-62772.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:268851337880:android:fc4111b1d145a00e", - "android_client_info": { - "package_name": "com.keylesspalace.tusky" - } - }, - "oauth_client": [ - { - "client_id": "268851337880-eie2ssto2d21bfihn9d1qupcrke8oebf.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.keylesspalace.tusky", - "certificate_hash": "18d196307d6e928e99c2e0bb9818c01c38aff2f9" - } - }, - { - "client_id": "268851337880-n19d05m282nirs1fc9kdd5n4of6je4fk.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyCbJtSjuk4I3Jy8PdUaO3TaQOXubcOUElo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "268851337880-n19d05m282nirs1fc9kdd5n4of6je4fk.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 31f778d7e..b6c799755 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -46,6 +46,7 @@ # remove all logging from production apk -assumenosideeffects class android.util.Log { + public static *** getStackTraceString(...); public static *** d(...); public static *** w(...); public static *** v(...); diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml deleted file mode 100644 index b7060e6e2..000000000 --- a/app/src/fdroid/AndroidManifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/fdroid/java/com/keylesspalace/tusky/MessagingService.java b/app/src/fdroid/java/com/keylesspalace/tusky/MessagingService.java deleted file mode 100644 index eaa1b1b53..000000000 --- a/app/src/fdroid/java/com/keylesspalace/tusky/MessagingService.java +++ /dev/null @@ -1,142 +0,0 @@ -/* Copyright 2017 Andrew Dawson - * - * This file is a part of Tusky. - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU General Public License as published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. - * - * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even - * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along with Tusky; if not, - * see . */ - -package com.keylesspalace.tusky; - -import android.app.IntentService; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.text.Spanned; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import com.keylesspalace.tusky.entity.Notification; -import com.keylesspalace.tusky.json.SpannedTypeAdapter; -import com.keylesspalace.tusky.json.StringWithEmoji; -import com.keylesspalace.tusky.json.StringWithEmojiTypeAdapter; -import com.keylesspalace.tusky.network.MastodonAPI; -import com.keylesspalace.tusky.util.NotificationMaker; -import com.keylesspalace.tusky.util.OkHttpUtils; - -import java.util.HashSet; -import java.util.List; - -import java.io.IOException; -import java.util.Set; - -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; - -public class MessagingService extends IntentService { - public static final int NOTIFY_ID = 6; // This is an arbitrary number. - - private MastodonAPI mastodonAPI; - - public MessagingService() { - super("Tusky Pull Notification Service"); - } - - @Override - protected void onHandleIntent(Intent intent) { - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences( - getApplicationContext()); - boolean enabled = preferences.getBoolean("notificationsEnabled", true); - if (!enabled) { - return; - } - - createMastodonApi(); - - mastodonAPI.notifications(null, null, null).enqueue(new Callback>() { - @Override - public void onResponse(Call> call, - Response> response) { - if (response.isSuccessful()) { - onNotificationsReceived(response.body()); - } - } - - @Override - public void onFailure(Call> call, Throwable t) {} - }); - } - - private void createMastodonApi() { - SharedPreferences preferences = getSharedPreferences( - getString(R.string.preferences_file_key), Context.MODE_PRIVATE); - final String domain = preferences.getString("domain", null); - final String accessToken = preferences.getString("accessToken", null); - - OkHttpClient okHttpClient = OkHttpUtils.getCompatibleClientBuilder() - .addInterceptor(new Interceptor() { - @Override - public okhttp3.Response intercept(Chain chain) throws IOException { - Request originalRequest = chain.request(); - - Request.Builder builder = originalRequest.newBuilder() - .header("Authorization", String.format("Bearer %s", accessToken)); - - Request newRequest = builder.build(); - - return chain.proceed(newRequest); - } - }) - .build(); - - Gson gson = new GsonBuilder() - .registerTypeAdapter(Spanned.class, new SpannedTypeAdapter()) - .registerTypeAdapter(StringWithEmoji.class, new StringWithEmojiTypeAdapter()) - .create(); - - Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://" + domain) - .client(okHttpClient) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build(); - - mastodonAPI = retrofit.create(MastodonAPI.class); - } - - private void onNotificationsReceived(List notificationList) { - SharedPreferences notificationsPreferences = getSharedPreferences( - "Notifications", Context.MODE_PRIVATE); - Set currentIds = notificationsPreferences.getStringSet( - "current_ids", new HashSet()); - for (Notification notification : notificationList) { - String id = notification.id; - if (!currentIds.contains(id)) { - currentIds.add(id); - NotificationMaker.make(this, NOTIFY_ID, notification); - } - } - notificationsPreferences.edit() - .putStringSet("current_ids", currentIds) - .apply(); - } - - public static String getInstanceToken() { - // This is only used for the "google" build flavor, so this version is just a stub method. - return null; - } -} diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml deleted file mode 100644 index 20ecbe94c..000000000 --- a/app/src/google/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/google/java/com/keylesspalace/tusky/MessagingService.java b/app/src/google/java/com/keylesspalace/tusky/MessagingService.java deleted file mode 100644 index 4a2a55da5..000000000 --- a/app/src/google/java/com/keylesspalace/tusky/MessagingService.java +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright 2017 Andrew Dawson - * - * This file is a part of Tusky. - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU General Public License as published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. - * - * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even - * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along with Tusky; if not, - * see . - * - * If you modify this Program, or any covered work, by linking or combining it with Firebase Cloud - * Messaging and Firebase Crash Reporting (or a modified version of those libraries), containing - * parts covered by the Google APIs Terms of Service, the licensors of this Program grant you - * additional permission to convey the resulting work. */ - -package com.keylesspalace.tusky; - -import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.text.Spanned; - -import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.messaging.FirebaseMessagingService; -import com.google.firebase.messaging.RemoteMessage; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import com.keylesspalace.tusky.entity.Notification; -import com.keylesspalace.tusky.json.SpannedTypeAdapter; -import com.keylesspalace.tusky.json.StringWithEmoji; -import com.keylesspalace.tusky.json.StringWithEmojiTypeAdapter; -import com.keylesspalace.tusky.network.MastodonAPI; -import com.keylesspalace.tusky.util.Log; -import com.keylesspalace.tusky.util.NotificationMaker; -import com.keylesspalace.tusky.util.OkHttpUtils; - -import java.io.IOException; - -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; - -public class MessagingService extends FirebaseMessagingService { - private MastodonAPI mastodonAPI; - private static final String TAG = "MessagingService"; - public static final int NOTIFY_ID = 666; - - @Override - public void onMessageReceived(RemoteMessage remoteMessage) { - Log.d(TAG, remoteMessage.getFrom()); - Log.d(TAG, remoteMessage.toString()); - - String notificationId = remoteMessage.getData().get("notification_id"); - - if (notificationId == null) { - Log.e(TAG, "No notification ID in payload!!"); - return; - } - - Log.d(TAG, notificationId); - - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences( - getApplicationContext()); - boolean enabled = preferences.getBoolean("notificationsEnabled", true); - if (!enabled) { - return; - } - - createMastodonAPI(); - - mastodonAPI.notification(notificationId).enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { - NotificationMaker.make(MessagingService.this, NOTIFY_ID, response.body()); - } - } - - @Override - public void onFailure(Call call, Throwable t) {} - }); - } - - private void createMastodonAPI() { - SharedPreferences preferences = getSharedPreferences(getString(R.string.preferences_file_key), Context.MODE_PRIVATE); - final String domain = preferences.getString("domain", null); - final String accessToken = preferences.getString("accessToken", null); - - OkHttpClient okHttpClient = OkHttpUtils.getCompatibleClientBuilder() - .addInterceptor(new Interceptor() { - @Override - public okhttp3.Response intercept(Chain chain) throws IOException { - Request originalRequest = chain.request(); - - Request.Builder builder = originalRequest.newBuilder() - .header("Authorization", String.format("Bearer %s", accessToken)); - - Request newRequest = builder.build(); - - return chain.proceed(newRequest); - } - }) - .build(); - - Gson gson = new GsonBuilder() - .registerTypeAdapter(Spanned.class, new SpannedTypeAdapter()) - .registerTypeAdapter(StringWithEmoji.class, new StringWithEmojiTypeAdapter()) - .create(); - - Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://" + domain) - .client(okHttpClient) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build(); - - mastodonAPI = retrofit.create(MastodonAPI.class); - } - - public static String getInstanceToken() { - return FirebaseInstanceId.getInstance().getToken(); - } -} diff --git a/app/src/google/java/com/keylesspalace/tusky/MyFirebaseInstanceIdService.java b/app/src/google/java/com/keylesspalace/tusky/MyFirebaseInstanceIdService.java deleted file mode 100644 index 14d640d54..000000000 --- a/app/src/google/java/com/keylesspalace/tusky/MyFirebaseInstanceIdService.java +++ /dev/null @@ -1,86 +0,0 @@ -/* Copyright 2017 Andrew Dawson - * - * This file is a part of Tusky. - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU General Public License as published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. - * - * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even - * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along with Tusky; if not, - * see . - * - * If you modify this Program, or any covered work, by linking or combining it with Firebase Cloud - * Messaging and Firebase Crash Reporting (or a modified version of those libraries), containing - * parts covered by the Google APIs Terms of Service, the licensors of this Program grant you - * additional permission to convey the resulting work. */ - -package com.keylesspalace.tusky; - -import android.content.Context; -import android.content.SharedPreferences; - -import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.iid.FirebaseInstanceIdService; -import com.keylesspalace.tusky.network.TuskyAPI; -import com.keylesspalace.tusky.util.Log; -import com.keylesspalace.tusky.util.OkHttpUtils; - -import okhttp3.ResponseBody; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; - -public class MyFirebaseInstanceIdService extends FirebaseInstanceIdService { - private static final String TAG = "com.keylesspalace.tusky.MyFirebaseInstanceIdService"; - - private TuskyAPI tuskyAPI; - - protected void createTuskyAPI() { - Retrofit retrofit = new Retrofit.Builder() - .baseUrl(getString(R.string.tusky_api_url)) - .client(OkHttpUtils.getCompatibleClient()) - .build(); - - tuskyAPI = retrofit.create(TuskyAPI.class); - } - - @Override - public void onTokenRefresh() { - createTuskyAPI(); - - String refreshedToken = FirebaseInstanceId.getInstance().getToken(); - SharedPreferences preferences = getSharedPreferences(getString(R.string.preferences_file_key), Context.MODE_PRIVATE); - String accessToken = preferences.getString("accessToken", null); - String domain = preferences.getString("domain", null); - - if (accessToken != null && domain != null) { - tuskyAPI.unregister("https://" + domain, accessToken).enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - Log.d(TAG, response.message()); - } - - @Override - public void onFailure(Call call, Throwable t) { - Log.d(TAG, t.getMessage()); - } - }); - tuskyAPI.register("https://" + domain, accessToken, refreshedToken).enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - Log.d(TAG, response.message()); - } - - @Override - public void onFailure(Call call, Throwable t) { - Log.d(TAG, t.getMessage()); - } - }); - } - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 23c638a70..93bd79602 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,15 +6,17 @@ - + + + + android:theme="@style/AppTheme"> + () { - @Override - public void onResponse(Call call, retrofit2.Response response) { - Log.d(TAG, "Enable push notifications response: " + response.message()); + Callback callback = new Callback() { + @Override + public void onResponse(Call call, + retrofit2.Response response) { + if (response.isSuccessful()) { + pushNotificationClient.subscribeToTopic(getPushNotificationTopic()); + pushNotificationClient.connect(BaseActivity.this); + } else { + onEnablePushNotificationsFailure(response.message()); } + } - @Override - public void onFailure(Call call, Throwable t) { - Log.d(TAG, "Enable push notifications failed: " + t.getMessage()); - } - }); - } else { - // Start up the MessagingService on a repeating interval for "pull" notifications. - long checkInterval = 60 * 1000 * 5; - AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE); - Intent intent = new Intent(this, MessagingService.class); - final int SERVICE_REQUEST_CODE = 8574603; // This number is arbitrary. - serviceAlarmIntent = PendingIntent.getService(this, SERVICE_REQUEST_CODE, intent, - PendingIntent.FLAG_UPDATE_CURRENT); - alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, - SystemClock.elapsedRealtime(), checkInterval, serviceAlarmIntent); - } + @Override + public void onFailure(Call call, Throwable t) { + onEnablePushNotificationsFailure(t.getMessage()); + } + }; + String deviceToken = pushNotificationClient.getDeviceToken(); + Session session = new Session(getDomain(), getAccessToken(), deviceToken); + tuskyApi.register(session) + .enqueue(callback); + } + + private void onEnablePushNotificationsFailure(String message) { + Log.e(TAG, "Enabling push notifications failed. " + message); } protected void disablePushNotifications() { - if (BuildConfig.USES_PUSH_NOTIFICATIONS) { - tuskyAPI.unregister(getBaseUrl(), getAccessToken()).enqueue(new Callback() { - @Override - public void onResponse(Call call, retrofit2.Response response) { - Log.d(TAG, "Disable push notifications response: " + response.message()); + Callback callback = new Callback() { + @Override + public void onResponse(Call call, + retrofit2.Response response) { + if (response.isSuccessful()) { + pushNotificationClient.unsubscribeToTopic(getPushNotificationTopic()); + } else { + onDisablePushNotificationsFailure(); } + } - @Override - public void onFailure(Call call, Throwable t) { - Log.d(TAG, "Disable push notifications failed: " + t.getMessage()); - } - }); - } else if (serviceAlarmIntent != null) { - // Cancel the repeating call for "pull" notifications. - AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE); - alarmManager.cancel(serviceAlarmIntent); - } + @Override + public void onFailure(Call call, Throwable t) { + onDisablePushNotificationsFailure(); + } + }; + String deviceToken = pushNotificationClient.getDeviceToken(); + Session session = new Session(getDomain(), getAccessToken(), deviceToken); + tuskyApi.unregister(session) + .enqueue(callback); + } + + private void onDisablePushNotificationsFailure() { + Log.e(TAG, "Disabling push notifications failed."); + } + + private String getPushNotificationTopic() { + return String.format("%s/%s/#", getDomain(), getAccessToken()); + } + + private String getDomain() { + return getPrivatePreferences() + .getString("domain", null); } } diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 6a5cb8b33..c4c99b64e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -56,6 +56,7 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; import android.text.style.URLSpan; +import android.util.Log; import android.view.MenuItem; import android.view.View; import android.webkit.MimeTypeMap; @@ -73,7 +74,6 @@ import com.keylesspalace.tusky.fragment.ComposeOptionsFragment; import com.keylesspalace.tusky.util.CountUpDownLatch; import com.keylesspalace.tusky.util.DownsizeImageTask; import com.keylesspalace.tusky.util.IOUtils; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.MediaUtils; import com.keylesspalace.tusky.util.ParserUtils; import com.keylesspalace.tusky.util.SpanUtils; @@ -252,7 +252,9 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm if (replyVisibility != null && startingVisibility != null) { // Lowest possible visibility setting in response - if (startingVisibility.equals("private") || replyVisibility.equals("private")) { + if (startingVisibility.equals("direct") || replyVisibility.equals("direct")) { + startingVisibility = "direct"; + } else if (startingVisibility.equals("private") || replyVisibility.equals("private")) { startingVisibility = "private"; } else if (startingVisibility.equals("unlisted") || replyVisibility.equals("unlisted")) { startingVisibility = "unlisted"; @@ -637,6 +639,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm try { descriptor = getContentResolver().openAssetFileDescriptor(uri, "r"); } catch (FileNotFoundException e) { + Log.d(TAG, Log.getStackTraceString(e)); // Eat this exception, having the descriptor be null is sufficient. } if (descriptor != null) { @@ -996,6 +999,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm try { stream = getContentResolver().openInputStream(item.uri); } catch (FileNotFoundException e) { + Log.d(TAG, Log.getStackTraceString(e)); return; } diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java index 03d9811dc..88e590723 100644 --- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java @@ -33,6 +33,7 @@ import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; import android.util.Base64; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -44,7 +45,6 @@ import android.widget.ProgressBar; import com.keylesspalace.tusky.entity.Account; import com.keylesspalace.tusky.entity.Profile; import com.keylesspalace.tusky.util.IOUtils; -import com.keylesspalace.tusky.util.Log; import com.pkmmte.view.CircularImageView; import com.squareup.picasso.Picasso; import com.theartofdev.edmodo.cropper.CropImage; @@ -486,12 +486,14 @@ public class EditProfileActivity extends BaseActivity { try { inputStream = contentResolver.openInputStream(uri); } catch (FileNotFoundException e) { + Log.d(TAG, Log.getStackTraceString(e)); return false; } Bitmap sourceBitmap; try { sourceBitmap = BitmapFactory.decodeStream(inputStream, null, null); } catch (OutOfMemoryError error) { + Log.d(TAG, Log.getStackTraceString(error)); return false; } finally { IOUtils.closeQuietly(inputStream); diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java index 9226dc6cf..810c318b3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java @@ -29,6 +29,7 @@ import android.support.customtabs.CustomTabsIntent; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.text.method.LinkMovementMethod; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -39,7 +40,6 @@ import com.keylesspalace.tusky.entity.AccessToken; import com.keylesspalace.tusky.entity.AppCredentials; import com.keylesspalace.tusky.network.MastodonAPI; import com.keylesspalace.tusky.util.CustomTabsHelper; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.OkHttpUtils; import java.util.HashMap; @@ -137,7 +137,7 @@ public class LoginActivity extends AppCompatActivity { s = s.replaceFirst("http://", ""); s = s.replaceFirst("https://", ""); // If a username was included (e.g. username@example.com), just take what's after the '@'. - int at = s.indexOf('@'); + int at = s.lastIndexOf('@'); if (at != -1) { s = s.substring(at + 1); } @@ -201,7 +201,7 @@ public class LoginActivity extends AppCompatActivity { @Override public void onFailure(Call call, Throwable t) { editText.setError(getString(R.string.error_failed_app_registration)); - t.printStackTrace(); + Log.e(TAG, Log.getStackTraceString(t)); } }; diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java index 3d39b81ae..d3d85a9be 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java @@ -15,7 +15,6 @@ package com.keylesspalace.tusky; -import android.app.NotificationManager; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -37,6 +36,7 @@ import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; import android.text.style.StyleSpan; +import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -48,7 +48,6 @@ import com.keylesspalace.tusky.entity.Account; import com.keylesspalace.tusky.fragment.SFragment; import com.keylesspalace.tusky.interfaces.StatusRemoveListener; import com.keylesspalace.tusky.pager.TimelinePagerAdapter; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.ThemeUtils; import com.mikepenz.google_material_typeface_library.GoogleMaterial; import com.mikepenz.materialdrawer.AccountHeader; @@ -215,8 +214,7 @@ public class MainActivity extends BaseActivity implements SFragment.OnUserRemove .putString("current", "[]") .apply(); - ((NotificationManager) (getSystemService(NOTIFICATION_SERVICE))) - .cancel(MessagingService.NOTIFY_ID); + pushNotificationClient.clearNotifications(this); /* After editing a profile, the profile header in the navigation drawer needs to be * refreshed */ diff --git a/app/src/main/java/com/keylesspalace/tusky/ReportActivity.java b/app/src/main/java/com/keylesspalace/tusky/ReportActivity.java index f8e4e4472..8b8198fc1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ReportActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ReportActivity.java @@ -25,6 +25,7 @@ import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -33,7 +34,6 @@ import android.widget.EditText; import com.keylesspalace.tusky.adapter.ReportAdapter; import com.keylesspalace.tusky.entity.Status; import com.keylesspalace.tusky.util.HtmlUtils; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.ThemeUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Session.java b/app/src/main/java/com/keylesspalace/tusky/entity/Session.java new file mode 100644 index 000000000..8a3c5d0bb --- /dev/null +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Session.java @@ -0,0 +1,28 @@ +/* Copyright 2017 Andrew Dawson + * + * This file is a part of Tusky. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Tusky; if not, + * see . */ + +package com.keylesspalace.tusky.entity; + +public class Session { + public String instanceUrl; + public String accessToken; + public String deviceToken; + + public Session(String instanceUrl, String accessToken, String deviceToken) { + this.instanceUrl = instanceUrl; + this.accessToken = accessToken; + this.deviceToken = deviceToken; + } +} diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java index db12f323e..b3259ab6a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java @@ -25,6 +25,7 @@ import android.support.design.widget.TabLayout; import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -42,9 +43,8 @@ import com.keylesspalace.tusky.entity.Relationship; import com.keylesspalace.tusky.interfaces.AccountActionListener; import com.keylesspalace.tusky.network.MastodonAPI; import com.keylesspalace.tusky.R; -import com.keylesspalace.tusky.view.EndlessOnScrollListener; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.ThemeUtils; +import com.keylesspalace.tusky.view.EndlessOnScrollListener; import java.util.List; diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java index cd95b215e..17e5ec35d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java @@ -27,6 +27,7 @@ import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -39,9 +40,8 @@ import com.keylesspalace.tusky.entity.Notification; import com.keylesspalace.tusky.entity.Status; import com.keylesspalace.tusky.interfaces.StatusActionListener; import com.keylesspalace.tusky.interfaces.StatusRemoveListener; -import com.keylesspalace.tusky.view.EndlessOnScrollListener; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.ThemeUtils; +import com.keylesspalace.tusky.view.EndlessOnScrollListener; import java.util.List; diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java index daff45e5f..484710167 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java @@ -28,6 +28,7 @@ import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,10 +39,9 @@ import com.keylesspalace.tusky.adapter.TimelineAdapter; import com.keylesspalace.tusky.entity.Status; import com.keylesspalace.tusky.interfaces.StatusActionListener; import com.keylesspalace.tusky.interfaces.StatusRemoveListener; -import com.keylesspalace.tusky.view.EndlessOnScrollListener; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.receiver.TimelineReceiver; import com.keylesspalace.tusky.util.ThemeUtils; +import com.keylesspalace.tusky.view.EndlessOnScrollListener; import java.util.Iterator; import java.util.List; diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java index 32a371429..a7daa2d81 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java @@ -25,6 +25,7 @@ import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,9 +39,8 @@ import com.keylesspalace.tusky.network.MastodonAPI; import com.keylesspalace.tusky.R; import com.keylesspalace.tusky.interfaces.StatusActionListener; import com.keylesspalace.tusky.interfaces.StatusRemoveListener; -import com.keylesspalace.tusky.view.ConversationLineItemDecoration; -import com.keylesspalace.tusky.util.Log; import com.keylesspalace.tusky.util.ThemeUtils; +import com.keylesspalace.tusky.view.ConversationLineItemDecoration; import retrofit2.Call; import retrofit2.Callback; diff --git a/app/src/main/java/com/keylesspalace/tusky/network/TuskyAPI.java b/app/src/main/java/com/keylesspalace/tusky/network/TuskyApi.java similarity index 67% rename from app/src/main/java/com/keylesspalace/tusky/network/TuskyAPI.java rename to app/src/main/java/com/keylesspalace/tusky/network/TuskyApi.java index 700de83c8..24384dcf8 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/TuskyAPI.java +++ b/app/src/main/java/com/keylesspalace/tusky/network/TuskyApi.java @@ -15,17 +15,16 @@ package com.keylesspalace.tusky.network; +import com.keylesspalace.tusky.entity.Session; + import okhttp3.ResponseBody; import retrofit2.Call; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; +import retrofit2.http.Body; import retrofit2.http.POST; -public interface TuskyAPI { - @FormUrlEncoded +public interface TuskyApi { @POST("/register") - Call register(@Field("instance_url") String instanceUrl, @Field("access_token") String accessToken, @Field("device_token") String deviceToken); - @FormUrlEncoded + Call register(@Body Session session); @POST("/unregister") - Call unregister(@Field("instance_url") String instanceUrl, @Field("access_token") String accessToken); + Call unregister(@Body Session session); } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/CustomTabURLSpan.java b/app/src/main/java/com/keylesspalace/tusky/util/CustomTabURLSpan.java index bef07fcf1..718fd8263 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/CustomTabURLSpan.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/CustomTabURLSpan.java @@ -9,6 +9,7 @@ import android.preference.PreferenceManager; import android.support.customtabs.CustomTabsIntent; import android.support.v4.content.ContextCompat; import android.text.style.URLSpan; +import android.util.Log; import android.view.View; import com.keylesspalace.tusky.R; diff --git a/app/src/main/java/com/keylesspalace/tusky/util/DownsizeImageTask.java b/app/src/main/java/com/keylesspalace/tusky/util/DownsizeImageTask.java index 0cbc35a83..fe222a708 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/DownsizeImageTask.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/DownsizeImageTask.java @@ -23,6 +23,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.support.annotation.Nullable; import android.support.media.ExifInterface; +import android.util.Log; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -32,6 +33,7 @@ import java.util.ArrayList; import java.util.List; public class DownsizeImageTask extends AsyncTask { + private static final String TAG = "DownsizeImageTask"; private int sizeLimit; private ContentResolver contentResolver; private Listener listener; @@ -100,6 +102,7 @@ public class DownsizeImageTask extends AsyncTask { try { inputStream = contentResolver.openInputStream(uri); } catch (FileNotFoundException e) { + Log.d(TAG, Log.getStackTraceString(e)); return ExifInterface.ORIENTATION_UNDEFINED; } if (inputStream == null) { @@ -109,6 +112,7 @@ public class DownsizeImageTask extends AsyncTask { try { exifInterface = new ExifInterface(inputStream); } catch (IOException e) { + Log.d(TAG, Log.getStackTraceString(e)); IOUtils.closeQuietly(inputStream); return ExifInterface.ORIENTATION_UNDEFINED; } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/Log.java b/app/src/main/java/com/keylesspalace/tusky/util/Log.java deleted file mode 100644 index 26d3d85fe..000000000 --- a/app/src/main/java/com/keylesspalace/tusky/util/Log.java +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2017 Andrew Dawson - * - * This file is a part of Tusky. - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU General Public License as published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. - * - * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even - * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along with Tusky; if not, - * see . */ - -package com.keylesspalace.tusky.util; - -import com.keylesspalace.tusky.BuildConfig; - -/**A wrapper for android.util.Log that allows for disabling logging, such as for release builds.*/ -public class Log { - private static final boolean LOGGING_ENABLED = BuildConfig.DEBUG; - - public static void i(String tag, String string) { - if (LOGGING_ENABLED) { - android.util.Log.i(tag, string); - } - } - - public static void e(String tag, String string) { - if (LOGGING_ENABLED) { - android.util.Log.e(tag, string); - } - } - - public static void d(String tag, String string) { - if (LOGGING_ENABLED) { - android.util.Log.d(tag, string); - } - } - - public static void v(String tag, String string) { - if (LOGGING_ENABLED) { - android.util.Log.v(tag, string); - } - } - - public static void w(String tag, String string) { - if (LOGGING_ENABLED) { - android.util.Log.w(tag, string); - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java b/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java index 22947dc02..156a9542f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java @@ -28,6 +28,7 @@ import android.provider.Settings; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; import android.support.v4.app.TaskStackBuilder; +import android.util.Log; import com.keylesspalace.tusky.MainActivity; import com.keylesspalace.tusky.R; @@ -41,6 +42,9 @@ import org.json.JSONArray; import org.json.JSONException; public class NotificationMaker { + + public static final String TAG = "NotificationMaker"; + public static void make(final Context context, final int notifyId, Notification body) { final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); @@ -68,7 +72,7 @@ public class NotificationMaker { alreadyContains = true; } } catch (JSONException e) { - e.printStackTrace(); + Log.d(TAG, Log.getStackTraceString(e)); } } @@ -129,7 +133,7 @@ public class NotificationMaker { builder.setContentTitle(String.format(context.getString(R.string.notification_title_summary), currentNotifications.length())) .setContentText(truncateWithEllipses(joinNames(context, currentNotifications), 40)); } catch (JSONException e) { - e.printStackTrace(); + Log.d(TAG, Log.getStackTraceString(e)); } } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java index c90002d20..577af8cf7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java @@ -17,6 +17,7 @@ package com.keylesspalace.tusky.util; import android.os.Build; import android.support.annotation.NonNull; +import android.util.Log; import com.keylesspalace.tusky.BuildConfig; diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ParserUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/ParserUtils.java index 80a932f65..90a155b13 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/ParserUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/ParserUtils.java @@ -5,6 +5,7 @@ import android.content.ClipboardManager; import android.content.Context; import android.os.AsyncTask; import android.text.TextUtils; +import android.util.Log; import android.webkit.URLUtil; import org.jsoup.Connection; diff --git a/app/src/main/java/com/keylesspalace/tusky/util/PushNotificationClient.java b/app/src/main/java/com/keylesspalace/tusky/util/PushNotificationClient.java new file mode 100644 index 000000000..eb97fb1fa --- /dev/null +++ b/app/src/main/java/com/keylesspalace/tusky/util/PushNotificationClient.java @@ -0,0 +1,238 @@ +package com.keylesspalace.tusky.util; + +import android.app.NotificationManager; +import android.content.Context; +import android.support.annotation.NonNull; +import android.text.Spanned; +import android.util.Log; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.keylesspalace.tusky.R; +import com.keylesspalace.tusky.entity.Notification; +import com.keylesspalace.tusky.json.SpannedTypeAdapter; +import com.keylesspalace.tusky.json.StringWithEmoji; +import com.keylesspalace.tusky.json.StringWithEmojiTypeAdapter; + +import org.eclipse.paho.android.service.MqttAndroidClient; +import org.eclipse.paho.client.mqttv3.DisconnectedBufferOptions; +import org.eclipse.paho.client.mqttv3.IMqttActionListener; +import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; +import org.eclipse.paho.client.mqttv3.IMqttToken; +import org.eclipse.paho.client.mqttv3.MqttCallbackExtended; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +import java.io.InputStream; +import java.util.ArrayDeque; +import java.util.ArrayList; + +import static android.content.Context.NOTIFICATION_SERVICE; + +public class PushNotificationClient { + private static final String TAG = "PushNotificationClient"; + private static final int NOTIFY_ID = 666; + + private static class QueuedAction { + enum Type { + SUBSCRIBE, + UNSUBSCRIBE, + DISCONNECT, + } + + Type type; + String topic; + + QueuedAction(Type type) { + this.type = type; + } + + QueuedAction(Type type, String topic) { + this.type = type; + this.topic = topic; + } + } + + private MqttAndroidClient mqttAndroidClient; + private ArrayDeque queuedActions; + private ArrayList subscribedTopics; + + public PushNotificationClient(final @NonNull Context applicationContext, + @NonNull String serverUri) { + queuedActions = new ArrayDeque<>(); + subscribedTopics = new ArrayList<>(); + + // Create the MQTT client. + String clientId = MqttClient.generateClientId(); + mqttAndroidClient = new MqttAndroidClient(applicationContext, serverUri, clientId); + mqttAndroidClient.setCallback(new MqttCallbackExtended() { + @Override + public void connectComplete(boolean reconnect, String serverURI) { + if (reconnect) { + flushQueuedActions(); + for (String topic : subscribedTopics) { + subscribeToTopic(topic); + } + } + } + + @Override + public void connectionLost(Throwable cause) { + onConnectionLost(); + } + + @Override + public void messageArrived(String topic, MqttMessage message) throws Exception { + onMessageReceived(applicationContext, new String(message.getPayload())); + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { + // This client is read-only, so this is unused. + } + }); + } + + private void flushQueuedActions() { + while (!queuedActions.isEmpty()) { + QueuedAction action = queuedActions.pop(); + switch (action.type) { + case SUBSCRIBE: subscribeToTopic(action.topic); break; + case UNSUBSCRIBE: unsubscribeToTopic(action.topic); break; + case DISCONNECT: disconnect(); break; + } + } + } + + /** Connect to the MQTT broker. */ + public void connect(Context context) { + MqttConnectOptions options = new MqttConnectOptions(); + options.setAutomaticReconnect(true); + options.setCleanSession(false); + try { + String password = context.getString(R.string.tusky_api_keystore_password); + InputStream keystore = context.getResources().openRawResource(R.raw.keystore_tusky_api); + try { + options.setSocketFactory(mqttAndroidClient.getSSLSocketFactory(keystore, password)); + } finally { + IOUtils.closeQuietly(keystore); + } + mqttAndroidClient.connect(options).setActionCallback(new IMqttActionListener() { + @Override + public void onSuccess(IMqttToken asyncActionToken) { + DisconnectedBufferOptions bufferOptions = new DisconnectedBufferOptions(); + bufferOptions.setBufferEnabled(true); + bufferOptions.setBufferSize(100); + bufferOptions.setPersistBuffer(false); + bufferOptions.setDeleteOldestMessages(false); + mqttAndroidClient.setBufferOpts(bufferOptions); + onConnectionSuccess(); + flushQueuedActions(); + } + + @Override + public void onFailure(IMqttToken asyncActionToken, Throwable exception) { + Log.e(TAG, "An exception occurred while connecting. " + exception.getMessage() + + " " + exception.getCause()); + onConnectionFailure(); + } + }); + } catch (MqttException e) { + Log.e(TAG, "An exception occurred while connecpting. " + e.getMessage()); + onConnectionFailure(); + } + } + + private void onConnectionSuccess() { + Log.v(TAG, "The connection succeeded."); + } + + private void onConnectionFailure() { + Log.v(TAG, "The connection failed."); + } + + private void onConnectionLost() { + Log.v(TAG, "The connection was lost."); + } + + /** Disconnect from the MQTT broker. */ + public void disconnect() { + if (!mqttAndroidClient.isConnected()) { + queuedActions.add(new QueuedAction(QueuedAction.Type.DISCONNECT)); + return; + } + try { + mqttAndroidClient.disconnect(); + } catch (MqttException ex) { + Log.e(TAG, "An exception occurred while disconnecting."); + onDisconnectFailed(); + } + } + + private void onDisconnectFailed() { + Log.v(TAG, "Failed while disconnecting from the broker."); + } + + /** Subscribe to the push notification topic. */ + public void subscribeToTopic(final String topic) { + if (!mqttAndroidClient.isConnected()) { + queuedActions.add(new QueuedAction(QueuedAction.Type.SUBSCRIBE, topic)); + return; + } + try { + mqttAndroidClient.subscribe(topic, 0, null, new IMqttActionListener() { + @Override + public void onSuccess(IMqttToken asyncActionToken) { + subscribedTopics.add(topic); + onConnectionSuccess(); + } + + @Override + public void onFailure(IMqttToken asyncActionToken, Throwable exception) { + Log.e(TAG, "An exception occurred while subscribing." + exception.getMessage()); + onConnectionFailure(); + } + }); + } catch (MqttException e) { + Log.e(TAG, "An exception occurred while subscribing." + e.getMessage()); + onConnectionFailure(); + } + } + + /** Unsubscribe from the push notification topic. */ + public void unsubscribeToTopic(String topic) { + if (!mqttAndroidClient.isConnected()) { + queuedActions.add(new QueuedAction(QueuedAction.Type.UNSUBSCRIBE, topic)); + return; + } + try { + mqttAndroidClient.unsubscribe(topic); + subscribedTopics.remove(topic); + } catch (MqttException e) { + Log.e(TAG, "An exception occurred while unsubscribing." + e.getMessage()); + onConnectionFailure(); + } + } + + private void onMessageReceived(final Context context, String message) { + Log.v(TAG, "Notification received: " + message); + + Gson gson = new GsonBuilder() + .registerTypeAdapter(Spanned.class, new SpannedTypeAdapter()) + .registerTypeAdapter(StringWithEmoji.class, new StringWithEmojiTypeAdapter()) + .create(); + Notification notification = gson.fromJson(message, Notification.class); + + NotificationMaker.make(context, NOTIFY_ID, notification); + } + + public void clearNotifications(Context context) { + ((NotificationManager) (context.getSystemService(NOTIFICATION_SERVICE))).cancel(NOTIFY_ID); + } + + public String getDeviceToken() { + return mqttAndroidClient.getClientId(); + } +} diff --git a/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java b/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java index df762377f..236aa2ec3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java +++ b/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java @@ -27,7 +27,6 @@ import com.keylesspalace.tusky.util.Assert; public class FlowLayout extends ViewGroup { private int paddingHorizontal; // internal padding between child views private int paddingVertical; // - private int totalHeight; public FlowLayout(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -35,11 +34,10 @@ public class FlowLayout extends ViewGroup { public FlowLayout(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - TypedArray a = context.getTheme().obtainStyledAttributes( - attrs, R.styleable.FlowLayout, 0, 0); + TypedArray a = context.getTheme() + .obtainStyledAttributes(attrs, R.styleable.FlowLayout, 0, 0); try { - paddingHorizontal = a.getDimensionPixelSize( - R.styleable.FlowLayout_paddingHorizontal, 0); + paddingHorizontal = a.getDimensionPixelSize(R.styleable.FlowLayout_paddingHorizontal, 0); paddingVertical = a.getDimensionPixelSize(R.styleable.FlowLayout_paddingVertical, 0); } finally { a.recycle(); @@ -60,26 +58,29 @@ public class FlowLayout extends ViewGroup { } else { childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); } - totalHeight = 0; + int rowHeight = 0; for (int i = 0; i < count; i++) { View child = getChildAt(i); if (child.getVisibility() != GONE) { - child.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), - childHeightMeasureSpec); + int widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST); + child.measure(widthSpec, childHeightMeasureSpec); int childwidth = child.getMeasuredWidth(); - totalHeight = Math.max(totalHeight, child.getMeasuredHeight() + paddingVertical); + int childHeight = child.getMeasuredHeight(); if (x + childwidth > width) { x = getPaddingLeft(); - y += totalHeight; + y += rowHeight; + rowHeight = childHeight + paddingVertical; + } else { + rowHeight = Math.max(rowHeight, childHeight + paddingVertical); } x += childwidth + paddingHorizontal; } } if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) { - height = y + totalHeight; + height = y + rowHeight; } else if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) { - if (y + totalHeight < height) { - height = y + totalHeight; + if (y + rowHeight < height) { + height = y + rowHeight; } } height += 5; // Fudge to avoid clipping bottom of last row. @@ -91,6 +92,7 @@ public class FlowLayout extends ViewGroup { final int width = r - l; int x = getPaddingLeft(); int y = getPaddingTop(); + int rowHeight = 0; for (int i = 0; i < getChildCount(); i++) { View child = getChildAt(i); if (child.getVisibility() != GONE) { @@ -98,11 +100,14 @@ public class FlowLayout extends ViewGroup { int childHeight = child.getMeasuredHeight(); if (x + childWidth > width) { x = getPaddingLeft(); - y += totalHeight; + y += rowHeight; + rowHeight = childHeight + paddingVertical; + } else { + rowHeight = Math.max(childHeight, rowHeight); } child.layout(x, y, x + childWidth, y + childHeight); x += childWidth + paddingHorizontal; } } } -} +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index c36fd02be..3a595f1d5 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -30,16 +30,12 @@ android:paddingTop="16dp" android:paddingBottom="16dp"> - + android:contentDescription="@null" /> Abonnés Favoris Utilisateurs bloqués + Utilisateurs muets + Editer votre profil + Demande de follow \@%s - %s boosté + %s a boosté Média sensible Cliquer pour voir Voir plus @@ -91,7 +94,12 @@ Nettoyer Sauvegarder Modifier le profil - + Accepter + Voulez-vous vous déconnectez ? + Rejeter + Annuler + Demandes de follow + Utilisateurs muets Partager l’URL de votre pouet avec… Partager le pouet avec… @@ -122,6 +130,7 @@ Média mis en ligne avec succès. Mise en ligne… Télécharger + Demande de follow en attente d\'une réponse Public : afficher dans les fils publics. Non listé : ne pas afficher dans les fils publics. @@ -145,6 +154,10 @@ Navigateur Utiliser le navigateur intégré. Masquer le bouton de suivi lors du défilement. + Montrer les boosts + Montrer les réponses + Onglets + Filtrage de fil %s a mentionné votre nom. %1$s, %2$s, %3$s et %4$d plus @@ -155,4 +168,15 @@ Compte bloqué. Partager le contenu du pouet. Partager le lien du pouet. + + Compte officiel de Tusky + À propos + Site du projet : https://tusky.keylesspalace.com + Rapport de bugs & demande de fonctionnalités : https://github.com/Vavassor/Tusky/issues + Version : %s + + + Demande effectuée + + Utilisateur débloqué diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 50a048417..560940d06 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -31,6 +31,8 @@ お気に入り ミュートしたユーザー ブロックしたユーザー + フォローリクエスト + プロフィールを編集 \@%s %sさんがブーストしました @@ -58,6 +60,7 @@ 新規投稿 Mastodonでログイン ログアウト + ログアウトしますか？ フォローする フォロー解除 ブロック @@ -78,6 +81,7 @@ お気に入り ミュートしたユーザー ブロックしたユーザー + フォローリクエスト スレッド メディア ブラウザで開く @@ -95,6 +99,8 @@ 保存 プロフィールを編集 取り消す + 許可 + 拒否 トゥートのURLを共有… トゥートを共有… @@ -117,6 +123,8 @@ インスタンスとは？ + 接続中… + mastodon.social, mstdn.jp, pawoo.net や その他 のような、あらゆるインスタンスのアドレスやドメインを入力できます。 @@ -128,10 +136,11 @@ メディアをアップロードしています アップロード中… ダウンロード + フォローリクエストの承認待ち：返答を待っています 公開：公開タイムラインに投稿する 未収載：公開タイムラインには表示しない - 非公開：フォロワーだけに公開 + フォロワー限定：フォロワーだけに公開 ダイレクト：返信先のユーザーだけに公開 通知 @@ -151,6 +160,10 @@ ブラウザ Chrome Custom Tabsを使用する スクロール中はフォローボタンを隠す + タイムラインのフィルタリング + タブ + ブーストを表示 + 返信を表示 %sさんが返信しました %1$sさん、%2$sさん、%3$sさんと他%4$d人 @@ -159,6 +172,21 @@ %d件の新しい通知 非公開アカウント + + このアプリについて + + + + + トゥートの内容を共有 トゥートへのリンクを共有 + + フォローリクエスト中 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index af74baf15..c96f719cd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -59,6 +59,7 @@ Napisz Zaloguj z Mastodon Wyloguj + Czy chcesz wylogować się? Obserwuj Przestań obserwować Zablokuj @@ -121,10 +122,16 @@ Czym jest instancja? - Wprowadź tu domenę lub adres instancji, np. mastodon.social, icosahedron.website, social.tchncs.de, i + Łączenie… + + Domenę lub adres instancji może zostać wprowadzona tutaj, + np. mastodon.social, icosahedron.website, social.tchncs.de, i wiele więcej! - \n\nJeżeli nie posiadasz jeszcze konta, wprowadź tu nazwę instancji, na której chcesz się zarejestrowa.\n\nInstancja jest miejscem, na którym znajduje się twoje konto, lecz komunikując się z innymi serwerami, działa tak, jakby były jednym portalem. - \n\nMożesz znaleźć więcej informacji na mastodon.social. + \n\nJeżeli nie posiadasz jeszcze konta, wprowadź tu nazwę instancji, na której chcesz się zarejestrowa. + Instancja jest miejscem, na którym znajduje się twoje konto, + lecz komunikując się z innymi serwerami, działa tak, + jakby były jednym portalem. + Możesz znaleźć więcej informacji na mastodon.social. Kończenie wysyłania treści Wysyłanie… @@ -151,8 +158,12 @@ Wygląd Użyj jasnego motywu Przeglądarka - Używaj kart Chrome + Używaj niestandardowych kart Chrome Ukryj przycisk obserwacji podczas przewijania + Filtrowanie osi czasu + Karty + Pokazuj podbicia + Pokazuj odpowiedzi %s wspomniał o tobie %1$s, %2$s, %3$s i %4$d innych @@ -161,6 +172,19 @@ %d nowych powiadomień Konto zablokowane + +  O programie + Wersja aplikacji: %s + + Strona projektu:\n + https://tusky.keylesspalace.com + + + Zgłoszenia błędów i propozycje funkcji:\n + https://github.com/Vavassor/Tusky/issues + + Profil Tusky\'ego + Udostępnij zawartość postu Udostępnij link do postu diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d5c8bd02e..87305fbe3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -44,15 +44,15 @@ #52a5e0 #f4f4f4 #f4f4f4 - #000000 - #000000 + #CC000000 + #CC000000 #3c3c3c #5f636f #ffffff #ffffff #ffffff #f6f7f7 - #000000 + #7C000000 #4f4f4f #4f4f4f #56a7e1 @@ -63,9 +63,9 @@ #cfcfcf #cfcfcf #9F9F9F - #000000 + #DE000000 #EFEFEF - #000000 + #DE000000 #8F8F8F #2F5F6F #EFEFEF diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index b2a8e3b6b..ad2d3b37b 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -2,7 +2,8 @@ Tusky https://tusky.keylesspalace.com - https://tuskynotifier.keylesspalace.com + apitusky.keylesspalace.com + your_password_here oauth2redirect com.keylesspalace.tusky diff --git a/build.gradle b/build.gradle index 80e6fd508..bfed59203 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,6 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.google.gms:google-services:3.0.0' } }