diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 830674470..35eb1ddfb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 202cd0b60..ea6654ec3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 25 - versionCode 42 - versionName "1.4.2" + versionCode 43 + versionName "1.4.3" } buildTypes { release { diff --git a/app/mastodon-etalab-v1.4.3.apk b/app/mastodon-etalab-v1.4.3.apk new file mode 100644 index 000000000..e92c4db97 Binary files /dev/null and b/app/mastodon-etalab-v1.4.3.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b99f00bf7..14e9faf47 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ 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 Thomas Schneider; if not, + You should have received a copy of the GNU General Public License along with Mastalab; if not, see --> . */ package fr.gouv.etalab.mastodon.activities; @@ -83,7 +83,7 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveSearcA about_thekinrar.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://instances.social/api/doc/")); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://instances.social/")); startActivity(browserIntent); } }); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java index 3f94d6c48..c3a02e8a0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java index 2d60e7e6e..70b5017fc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java index 85162f735..494c2893e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; @@ -23,6 +23,7 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -105,10 +106,12 @@ public class LoginActivity extends AppCompatActivity { @Override public void afterTextChanged(Editable s) { if( s.length() > 2 ){ + if( s.toString().trim().startsWith("mas") && (!s.toString().trim().contains(".") || s.toString().trim().equals("mastodon.")) ) + return; String action = "/instances/search"; RequestParams parameters = new RequestParams(); parameters.add("q", s.toString().trim()); - parameters.add("count", String.valueOf(10)); + parameters.add("count", String.valueOf(5)); new KinrarClient().get(action, parameters, new AsyncHttpResponseHandler() { @Override public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) { @@ -129,7 +132,7 @@ public class LoginActivity extends AppCompatActivity { ArrayAdapter adapter = new ArrayAdapter<>(LoginActivity.this, android.R.layout.simple_list_item_1, instances); login_instance.setAdapter(adapter); - adapter.notifyDataSetChanged(); + login_instance.showDropDown(); } catch (JSONException ignored) {} } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java index 82cdc1a7c..84e2fac5a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java index 8879e865f..a457c2a32 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.activities; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.Application; import android.os.StrictMode; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java index ad75c489e..34c636db7 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PrivacyActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PrivacyActivity.java index b69483630..831e16471 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PrivacyActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PrivacyActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java index c678737fa..5492a5787 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 62bcd8119..949dbf9f7 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index 09105fb33..eb6e5f6bb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/SplashActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/SplashActivity.java index f9d27a6bb..4583aadb8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/SplashActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/SplashActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index f9bb2464f..07be785da 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java index dac368945..bc48f72c9 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java index ba7d070da..779dbbd7c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.activities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java index 536cb0c14..59a0b099b 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostNotificationsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostNotificationsAsyncTask.java index 4a3f0d90d..03509c01c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostNotificationsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostNotificationsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostStatusAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostStatusAsyncTask.java index 301cf0a35..e7d333861 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostStatusAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostStatusAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RemoveAccountAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RemoveAccountAsyncTask.java index 5331dd944..c02454cab 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RemoveAccountAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RemoveAccountAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountAsyncTask.java index be64df85f..464f748ef 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountInfoAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountInfoAsyncTask.java index 529b828fa..328943546 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountInfoAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountInfoAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountsAsyncTask.java index c514193b9..a049c17c2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveAccountsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java index 835b2351d..13fd13c86 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java index d5e749350..5a8b1aff5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java index 573b55237..ec191247a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFollowRequestSentAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFollowRequestSentAsyncTask.java index de8bfe758..eb7e66b67 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFollowRequestSentAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFollowRequestSentAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveHomeTimelineServiceAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveHomeTimelineServiceAsyncTask.java index 0bb97ae02..5787bbbe2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveHomeTimelineServiceAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveHomeTimelineServiceAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveInstanceAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveInstanceAsyncTask.java index 85f43b306..0efc8edf2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveInstanceAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveInstanceAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java index 5a8d23035..a76651505 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRelationshipAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRelationshipAsyncTask.java index 4a592f842..8347f0df4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRelationshipAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRelationshipAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveScheduledTootsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveScheduledTootsAsyncTask.java index a07d514fa..e343d011c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveScheduledTootsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveScheduledTootsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAccountsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAccountsAsyncTask.java index dfa15cfdf..e5cdeceba 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAccountsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAccountsAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAsyncTask.java index 41df59b8f..ab969f04d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveSearchAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java index 137a2fe51..ced1386bf 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoByIDAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoByIDAsyncTask.java index 3cb4c1e31..9ae2317c9 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoByIDAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoByIDAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateCredentialAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateCredentialAsyncTask.java index 39f18c5e5..b54e9adcb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateCredentialAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateCredentialAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UploadActionAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UploadActionAsyncTask.java index af143ca5a..467a6f064 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UploadActionAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UploadActionAsyncTask.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.asynctasks; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index ff32f4887..bf43022ee 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.client; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; @@ -1258,6 +1258,7 @@ public class API { status.setSpoiler_text(resobj.get("spoiler_text").toString()); status.setVisibility(resobj.get("visibility").toString()); status.setLanguage(resobj.get("language").toString()); + status.setUrl(resobj.get("url").toString()); //TODO: replace by the value status.setApplication(new Application()); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/APIResponse.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/APIResponse.java index 3f3149e18..3645af24c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/APIResponse.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/APIResponse.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.client; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; import java.util.List; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java index d2c0ccb41..de8cdadb6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Application.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Application.java index 6849ce4f7..41093cc51 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Application.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Application.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Attachment.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Attachment.java index 890719459..ba1dff504 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Attachment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Attachment.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Card.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Card.java index f028e508b..a2bb98e6c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Card.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Card.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Context.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Context.java index 3cdaacebe..aa0c082e6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Context.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Context.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Error.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Error.java index 0fb6d9968..e5f88fc42 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Error.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Error.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Instance.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Instance.java index b34510426..1536e143e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Instance.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Instance.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Mention.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Mention.java index 099fab88a..61dbf5f4e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Mention.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Mention.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Notification.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Notification.java index 6b2900cf5..a8cc8f74d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Notification.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Notification.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Relationship.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Relationship.java index c04df9ba0..01c51c74f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Relationship.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Relationship.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java index 0e3127332..abd4f8569 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Tag.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Tag.java index 86457a0aa..ec5bba3e8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Tag.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Tag.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client.Entities; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/KinrarClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/KinrarClient.java index 11febbfe4..1b28eb44f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/KinrarClient.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/KinrarClient.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/MastalabSSLSocketFactory.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/MastalabSSLSocketFactory.java index d0cd06405..e3effd96f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/MastalabSSLSocketFactory.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/MastalabSSLSocketFactory.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/OauthClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/OauthClient.java index 757adbbc3..284f631a4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/OauthClient.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/OauthClient.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.client; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/PatchBaseImageDownloader.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/PatchBaseImageDownloader.java index 036d24536..d989057f6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/PatchBaseImageDownloader.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/PatchBaseImageDownloader.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.client; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java index e06561854..19a73ba51 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java index 048932a36..146f42746 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.AlertDialog; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java index 38dcc8398..eb168cdc8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java index 2de016633..924954701 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index f73cf9c19..658255b44 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.AlertDialog; @@ -32,8 +32,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; +import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; @@ -44,6 +46,7 @@ import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer; import java.util.ArrayList; import java.util.List; +import fr.gouv.etalab.mastodon.activities.MediaActivity; import fr.gouv.etalab.mastodon.activities.ShowAccountActivity; import fr.gouv.etalab.mastodon.activities.ShowConversationActivity; import fr.gouv.etalab.mastodon.activities.TootActivity; @@ -51,6 +54,7 @@ import fr.gouv.etalab.mastodon.asynctasks.PostActionAsyncTask; import fr.gouv.etalab.mastodon.asynctasks.PostNotificationsAsyncTask; import fr.gouv.etalab.mastodon.client.API; import fr.gouv.etalab.mastodon.client.APIResponse; +import fr.gouv.etalab.mastodon.client.Entities.Attachment; import fr.gouv.etalab.mastodon.client.Entities.Error; import fr.gouv.etalab.mastodon.interfaces.OnPostActionInterface; import fr.gouv.etalab.mastodon.interfaces.OnPostNotificationsActionInterface; @@ -76,13 +80,18 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio private final int REBLOG = 1; private final int FAVOURITE = 2; private NotificationsListAdapter notificationsListAdapter; + private int behaviorWithAttachments; + private boolean isOnWifi; - public NotificationsListAdapter(Context context, List notifications){ + + public NotificationsListAdapter(Context context, boolean isOnWifi, int behaviorWithAttachments, List notifications){ this.context = context; this.notifications = notifications; layoutInflater = LayoutInflater.from(this.context); imageLoader = ImageLoader.getInstance(); notificationsListAdapter = this; + this.isOnWifi = isOnWifi; + this.behaviorWithAttachments = behaviorWithAttachments; options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false) .cacheOnDisk(true).resetViewBeforeLoading(true).build(); } @@ -126,6 +135,19 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio holder.status_reply = (ImageView) convertView.findViewById(R.id.status_reply); holder.status_privacy = (ImageView) convertView.findViewById(R.id.status_privacy); holder.notification_delete = (ImageView) convertView.findViewById(R.id.notification_delete); + + holder.status_show_more = (Button) convertView.findViewById(R.id.status_show_more); + holder.status_prev1 = (ImageView) convertView.findViewById(R.id.status_prev1); + holder.status_prev2 = (ImageView) convertView.findViewById(R.id.status_prev2); + holder.status_prev3 = (ImageView) convertView.findViewById(R.id.status_prev3); + holder.status_prev4 = (ImageView) convertView.findViewById(R.id.status_prev4); + holder.status_prev1_play = (ImageView) convertView.findViewById(R.id.status_prev1_play); + holder.status_prev2_play = (ImageView) convertView.findViewById(R.id.status_prev2_play); + holder.status_prev3_play = (ImageView) convertView.findViewById(R.id.status_prev3_play); + holder.status_prev4_play = (ImageView) convertView.findViewById(R.id.status_prev4_play); + holder.status_container2 = (LinearLayout) convertView.findViewById(R.id.status_container2); + holder.status_container3 = (LinearLayout) convertView.findViewById(R.id.status_container3); + holder.status_prev4_container = (RelativeLayout) convertView.findViewById(R.id.status_prev4_container); convertView.setTag(holder); } else { holder = (ViewHolder) convertView.getTag(); @@ -284,6 +306,63 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio imgReblog.setBounds(0,0,(int) (20 * scale + 0.5f),(int) (20 * scale + 0.5f)); holder.status_favorite_count.setCompoundDrawables(imgFav, null, null, null); holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null); + + + if( status.getReblog() == null) { + if (status.getMedia_attachments().size() < 1) { + holder.status_document_container.setVisibility(View.GONE); + holder.status_show_more.setVisibility(View.GONE); + } else { + //If medias are loaded without any conditions or if device is on wifi + if (!status.isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { + loadAttachments(status, holder); + holder.status_show_more.setVisibility(View.GONE); + status.setAttachmentShown(true); + } else { + //Text depending if toots is sensitive or not + String textShowMore = (status.isSensitive()) ? context.getString(R.string.load_sensitive_attachment) : context.getString(R.string.load_attachment); + holder.status_show_more.setText(textShowMore); + if (!status.isAttachmentShown()) { + holder.status_show_more.setVisibility(View.VISIBLE); + holder.status_document_container.setVisibility(View.GONE); + } else { + loadAttachments(status, holder); + } + } + } + }else { //Attachments for reblogs + if (status.getReblog().getMedia_attachments().size() < 1) { + holder.status_document_container.setVisibility(View.GONE); + holder.status_show_more.setVisibility(View.GONE); + } else { + //If medias are loaded without any conditions or if device is on wifi + if (!status.getReblog().isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { + loadAttachments(status.getReblog(), holder); + holder.status_show_more.setVisibility(View.GONE); + status.getReblog().setAttachmentShown(true); + } else { + //Text depending if toots is sensitive or not + String textShowMore = (status.getReblog().isSensitive()) ? context.getString(R.string.load_sensitive_attachment) : context.getString(R.string.load_attachment); + holder.status_show_more.setText(textShowMore); + if (!status.isAttachmentShown()) { + holder.status_show_more.setVisibility(View.VISIBLE); + holder.status_document_container.setVisibility(View.GONE); + } else { + loadAttachments(status.getReblog(), holder); + } + } + } + } + holder.status_show_more.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + loadAttachments(status, holder); + holder.status_show_more.setVisibility(View.GONE); + status.setAttachmentShown(true); + notificationsListAdapter.notifyDataSetChanged(); + } + }); + }else { holder.notification_status_container.setVisibility(View.GONE); } @@ -491,6 +570,89 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio } + private void loadAttachments(final Status status, ViewHolder holder){ + List attachments = status.getMedia_attachments(); + if( attachments != null && attachments.size() > 0){ + int i = 0; + if( attachments.size() == 1){ + holder.status_container2.setVisibility(View.GONE); + if( attachments.get(0).getUrl().trim().contains("missing.png")) + holder.status_document_container.setVisibility(View.GONE); + else + holder.status_document_container.setVisibility(View.VISIBLE); + }else if(attachments.size() == 2){ + holder.status_container2.setVisibility(View.VISIBLE); + holder.status_container3.setVisibility(View.GONE); + if( attachments.get(1).getUrl().trim().contains("missing.png")) + holder.status_container2.setVisibility(View.GONE); + holder.status_document_container.setVisibility(View.VISIBLE); + }else if( attachments.size() == 3){ + holder.status_container2.setVisibility(View.VISIBLE); + holder.status_container3.setVisibility(View.VISIBLE); + holder.status_prev4_container.setVisibility(View.GONE); + if( attachments.get(2).getUrl().trim().contains("missing.png")) + holder.status_container3.setVisibility(View.GONE); + holder.status_document_container.setVisibility(View.VISIBLE); + }else { + holder.status_prev4_container.setVisibility(View.VISIBLE); + if( attachments.get(2).getUrl().trim().contains("missing.png")) + holder.status_prev4_container.setVisibility(View.GONE); + holder.status_document_container.setVisibility(View.VISIBLE); + } + int position = 1; + for(final Attachment attachment: attachments){ + ImageView imageView; + if( i == 0) { + imageView = holder.status_prev1; + if( attachment.getType().equals("image")) + holder.status_prev1_play.setVisibility(View.GONE); + else + holder.status_prev1_play.setVisibility(View.VISIBLE); + }else if( i == 1) { + imageView = holder.status_prev2; + if( attachment.getType().equals("image")) + holder.status_prev2_play.setVisibility(View.GONE); + else + holder.status_prev2_play.setVisibility(View.VISIBLE); + }else if(i == 2) { + imageView = holder.status_prev3; + if( attachment.getType().equals("image")) + holder.status_prev3_play.setVisibility(View.GONE); + else + holder.status_prev3_play.setVisibility(View.VISIBLE); + }else { + imageView = holder.status_prev4; + if( attachment.getType().equals("image")) + holder.status_prev4_play.setVisibility(View.GONE); + else + holder.status_prev4_play.setVisibility(View.VISIBLE); + } + String url = attachment.getPreview_url(); + if( url == null || url.trim().equals("")) + url = attachment.getUrl(); + if( !url.trim().contains("missing.png")) + imageLoader.displayImage(url, imageView, options); + final int finalPosition = position; + imageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, MediaActivity.class); + Bundle b = new Bundle(); + intent.putParcelableArrayListExtra("mediaArray", status.getMedia_attachments()); + b.putInt("position", finalPosition); + intent.putExtras(b); + context.startActivity(intent); + } + }); + i++; + position++; + } + }else{ + holder.status_document_container.setVisibility(View.GONE); + } + holder.status_show_more.setVisibility(View.GONE); + } + private class ViewHolder { CardView card_status_container; @@ -504,6 +666,18 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio TextView status_date; ImageView status_reply; LinearLayout status_document_container; + Button status_show_more; + ImageView status_prev1; + ImageView status_prev2; + ImageView status_prev3; + ImageView status_prev4; + ImageView status_prev1_play; + ImageView status_prev2_play; + ImageView status_prev3_play; + ImageView status_prev4_play; + RelativeLayout status_prev4_container; + LinearLayout status_container2; + LinearLayout status_container3; LinearLayout notification_status_container; ImageView status_privacy; } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java index c7fa85a12..96b32d15f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.AlertDialog; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchListAdapter.java index 5d0b7b78a..7c6b0acf4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 297a70749..e6d4e24dc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.AlertDialog; @@ -907,7 +907,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf else //noinspection deprecation builderInner.setMessage(Html.fromHtml(status.getContent())); - }else{ + }else if( which == 1){ ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); String content; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) @@ -920,17 +920,24 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf Toast.makeText(context,R.string.clipboard,Toast.LENGTH_LONG).show(); dialog.dismiss(); return; + }else { + Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via)); + sendIntent.putExtra(Intent.EXTRA_TEXT, status.getUrl()); + sendIntent.setType("text/plain"); + context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with))); + return; } }else { if( which < 2 ){ builderInner.setMessage(status.getAccount().getAcct()); - }else if( which < 3) { + }else if( which == 2) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) builderInner.setMessage(Html.fromHtml(status.getContent(), Html.FROM_HTML_MODE_COMPACT)); else //noinspection deprecation builderInner.setMessage(Html.fromHtml(status.getContent())); - }else{ + }else if( which == 3 ){ ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); String content; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) @@ -943,6 +950,13 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf Toast.makeText(context,R.string.clipboard,Toast.LENGTH_LONG).show(); dialog.dismiss(); return; + }else { + Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via)); + sendIntent.putExtra(Intent.EXTRA_TEXT, status.getUrl()); + sendIntent.setType("text/plain"); + context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with))); + return; } } //Text for report diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsListAdapter.java index f0c3401c2..d587c2439 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsListAdapter.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.drawers; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java index d8e93fb69..1feaa1cda 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java index 66885b287..f11ce861b 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java index 938e9e61c..736b62053 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; import android.content.SharedPreferences; @@ -34,7 +34,6 @@ import java.util.List; import fr.gouv.etalab.mastodon.client.APIResponse; import fr.gouv.etalab.mastodon.client.Entities.Account; import fr.gouv.etalab.mastodon.drawers.NotificationsListAdapter; -import fr.gouv.etalab.mastodon.drawers.StatusListAdapter; import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.sqlite.AccountDAO; import fr.gouv.etalab.mastodon.sqlite.Sqlite; @@ -86,7 +85,9 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve textviewNoAction = (RelativeLayout) rootView.findViewById(R.id.no_action); mainLoader.setVisibility(View.VISIBLE); nextElementLoader.setVisibility(View.GONE); - notificationsListAdapter = new NotificationsListAdapter(context, this.notifications); + boolean isOnWifi = Helper.isOnWIFI(context); + int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS); + notificationsListAdapter = new NotificationsListAdapter(context,isOnWifi, behaviorWithAttachments,this.notifications); lv_notifications.setAdapter(notificationsListAdapter); lv_notifications.setOnScrollListener(new AbsListView.OnScrollListener() { @Override @@ -159,11 +160,10 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve @Override public void onRetrieveNotifications(APIResponse apiResponse, String acct, String userId) { - + final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); if( show_error_messages) Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); @@ -178,7 +178,9 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve else textviewNoAction.setVisibility(View.GONE); if( swiped ){ - notificationsListAdapter = new NotificationsListAdapter(context, this.notifications); + boolean isOnWifi = Helper.isOnWIFI(context); + int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS); + notificationsListAdapter = new NotificationsListAdapter(context,isOnWifi, behaviorWithAttachments, this.notifications); lv_notifications.setAdapter(notificationsListAdapter); swiped = false; } @@ -194,7 +196,6 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve flag_loading = notifications != null && notifications.size() < notificationPerPage; //Store last notification id to avoid to notify for those that have been already seen if( notifications != null && notifications.size() > 0) { - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); //acct is null as userId when used in Fragment, data need to be retrieved via shared preferences and db userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java index 50323f3cb..1bdde0578 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.annotation.SuppressLint; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index 4f0102345..21319c8e8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index 42261a35f..658980742 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java index 3f5583193..4cfdc60ca 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.annotation.SuppressLint; import android.app.TimePickerDialog; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java index 110d918eb..538fa9245 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsProfileFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsProfileFragment.java index a9b0aab07..213727253 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsProfileFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsProfileFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.Activity; import android.app.AlertDialog; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutSettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutSettingsFragment.java index ba31cd8e8..687b5625f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutSettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutSettingsFragment.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.fragments; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.os.Bundle; import android.support.design.widget.TabLayout; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index b45c0cf38..a33df921a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostActionInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostActionInterface.java index 5e56596cd..6bf7d4d83 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostActionInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostActionInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostNotificationsActionInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostNotificationsActionInterface.java index 7c6ba311a..76b1a81bd 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostNotificationsActionInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostNotificationsActionInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostStatusActionInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostStatusActionInterface.java index b3ac3be71..4701e2128 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostStatusActionInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnPostStatusActionInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountInterface.java index b2cc34802..3b76d0ead 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountsInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountsInterface.java index b6204bd69..032918728 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountsInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAccountsInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAttachmentInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAttachmentInterface.java index e79f63d44..9c93e297d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAttachmentInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveAttachmentInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java index 4a5b5d490..909211fca 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsAccountInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsAccountInterface.java index f12d73966..1d0ee6bf6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsAccountInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsAccountInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsInterface.java index 9c209148c..8ca4df95c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveFeedsInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveHomeTimelineServiceInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveHomeTimelineServiceInterface.java index 26f6f7749..a254c3166 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveHomeTimelineServiceInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveHomeTimelineServiceInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveInstanceInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveInstanceInterface.java index ede0101a2..7046e66ea 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveInstanceInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveInstanceInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveNotificationsInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveNotificationsInterface.java index 1db8cec03..027e6c4de 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveNotificationsInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveNotificationsInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRelationshipInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRelationshipInterface.java index 8bc6dabdd..ffa6f1576 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRelationshipInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRelationshipInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveScheduledTootsInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveScheduledTootsInterface.java index 123272621..1572ba602 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveScheduledTootsInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveScheduledTootsInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearcAccountshInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearcAccountshInterface.java index 1086f3191..b46c8b92e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearcAccountshInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearcAccountshInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearchInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearchInterface.java index 4b0416ab9..372df0f75 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearchInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveSearchInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnTranslatedInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnTranslatedInterface.java index 00966aaac..902963b4f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnTranslatedInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnTranslatedInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateAccountInfoInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateAccountInfoInterface.java index 57abdb64f..ab392dcfd 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateAccountInfoInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateAccountInfoInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateCredentialInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateCredentialInterface.java index d31a80302..05949e474 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateCredentialInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnUpdateCredentialInterface.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.interfaces; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java index 113da0f38..6ef775468 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.jobs; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import com.evernote.android.job.Job; import com.evernote.android.job.JobCreator; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java index 3d1c1aa5a..80042d245 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.jobs; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java index 940c7dbdb..d05321e7f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.jobs; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java index ade5037fa..0b920d8ec 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.jobs; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/AccountDAO.java b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/AccountDAO.java index 005674d61..55867d1e4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/AccountDAO.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/AccountDAO.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.sqlite; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.ContentValues; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java index 9b20965f3..51e4da491 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.sqlite; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/StatusStoredDAO.java b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/StatusStoredDAO.java index a9b3fc6e8..f33324616 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/StatusStoredDAO.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/StatusStoredDAO.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.sqlite; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.content.ContentValues; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateClient.java index 2b5ea6879..7d47bf6c2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateClient.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateClient.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.translation; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateQuery.java b/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateQuery.java index cc0e3614c..08fc06392 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateQuery.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/translation/GoogleTranslateQuery.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.translation; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexClient.java index d627d449a..e99fb21e4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexClient.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexClient.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.translation; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexQuery.java b/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexQuery.java index 44235165d..93c808890 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexQuery.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexQuery.java @@ -10,7 +10,7 @@ * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ package fr.gouv.etalab.mastodon.translation; import com.loopj.android.http.AsyncHttpResponseHandler; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebChromeClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebChromeClient.java index 76e6755cd..84d3dc6f0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebChromeClient.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebChromeClient.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.webview; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.Activity; import android.graphics.Bitmap; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java index 43bb26bd0..01052eb6e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java @@ -11,7 +11,7 @@ package fr.gouv.etalab.mastodon.webview; * 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 Thomas Schneider; if not, + * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ import android.app.Activity; import android.graphics.Bitmap; diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index dcb6ef67b..0ae513029 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -12,7 +12,7 @@ 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 Thomas Schneider; if not, + You should have received a copy of the GNU General Public License along with Mastalab; if not, see --> diff --git a/app/src/main/res/layout-sw600dp/activity_about.xml b/app/src/main/res/layout-sw600dp/activity_about.xml index 065ac392b..5b812f82e 100644 --- a/app/src/main/res/layout-sw600dp/activity_about.xml +++ b/app/src/main/res/layout-sw600dp/activity_about.xml @@ -12,7 +12,7 @@ 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 Thomas Schneider; if not, + You should have received a copy of the GNU General Public License along with Mastalab; if not, see . --> . --> . --> . --> . --> . --> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 93e65c1ed..bb4531b8b 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -12,7 +12,7 @@ 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 Thomas Schneider; if not, + You should have received a copy of the GNU General Public License along with Mastalab; if not, see . --> --> . --> . --> . --> . --> . --> --> --> . --> . --> . --> . --> . --> . --> . --> . --> + android:layout_height="200dp" + android:baselineAligned="false"> + + + + + + + + + + + + + + + + + + + + + +