Merged in develop (pull request #6)
This commit is contained in:
commit
a1878c82f8
|
@ -7,8 +7,8 @@ android {
|
||||||
applicationId "fr.gouv.etalab.mastodon"
|
applicationId "fr.gouv.etalab.mastodon"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 8
|
versionCode 9
|
||||||
versionName "1.1.1"
|
versionName "1.1.2"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
@ -20,7 +20,6 @@ android {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile 'com.google.android.gms:play-services-safetynet:10.2.4'
|
|
||||||
compile 'com.android.support:appcompat-v7:25.3.1'
|
compile 'com.android.support:appcompat-v7:25.3.1'
|
||||||
compile 'com.android.support:design:25.3.1'
|
compile 'com.android.support:design:25.3.1'
|
||||||
compile 'com.android.support:support-v4:25.3.1'
|
compile 'com.android.support:support-v4:25.3.1'
|
||||||
|
|
|
@ -70,11 +70,6 @@
|
||||||
android:configChanges="orientation|screenSize"
|
android:configChanges="orientation|screenSize"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
/>
|
/>
|
||||||
<activity android:name="fr.gouv.etalab.mastodon.activities.WebviewActivity"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
||||||
android:launchMode="singleTask"
|
|
||||||
/>
|
|
||||||
<activity
|
<activity
|
||||||
android:name="fr.gouv.etalab.mastodon.activities.SplashActivity"
|
android:name="fr.gouv.etalab.mastodon.activities.SplashActivity"
|
||||||
android:theme="@style/SplashTheme">
|
android:theme="@style/SplashTheme">
|
||||||
|
|
|
@ -55,7 +55,7 @@ public class AboutActivity extends AppCompatActivity {
|
||||||
about_code.setOnClickListener(new View.OnClickListener() {
|
about_code.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://bitbucket.org/tom79/mastodon_etalab"));
|
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://bitbucket.org/tom79/mastodon_etalab/src"));
|
||||||
startActivity(browserIntent);
|
startActivity(browserIntent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -15,27 +15,36 @@
|
||||||
package fr.gouv.etalab.mastodon.activities;
|
package fr.gouv.etalab.mastodon.activities;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
|
import android.widget.EditText;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.loopj.android.http.AsyncHttpClient;
|
||||||
import com.loopj.android.http.AsyncHttpResponseHandler;
|
import com.loopj.android.http.AsyncHttpResponseHandler;
|
||||||
import com.loopj.android.http.RequestParams;
|
import com.loopj.android.http.RequestParams;
|
||||||
|
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.security.KeyManagementException;
|
||||||
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.UnrecoverableKeyException;
|
||||||
|
|
||||||
import cz.msebera.android.httpclient.Header;
|
import cz.msebera.android.httpclient.Header;
|
||||||
|
import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoAsyncTask;
|
||||||
|
import fr.gouv.etalab.mastodon.client.MastalabSSLSocketFactory;
|
||||||
import fr.gouv.etalab.mastodon.client.OauthClient;
|
import fr.gouv.etalab.mastodon.client.OauthClient;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
|
|
||||||
|
import static fr.gouv.etalab.mastodon.helper.Helper.USER_AGENT;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Thomas on 23/04/2017.
|
* Created by Thomas on 23/04/2017.
|
||||||
|
@ -65,13 +74,12 @@ public class LoginActivity extends AppCompatActivity {
|
||||||
|
|
||||||
private void retrievesClientId(){
|
private void retrievesClientId(){
|
||||||
final Button connectionButton = (Button) findViewById(R.id.login_button);
|
final Button connectionButton = (Button) findViewById(R.id.login_button);
|
||||||
final Intent webviewIntent = new Intent(this, WebviewActivity.class);
|
|
||||||
String action = "/api/v1/apps";
|
String action = "/api/v1/apps";
|
||||||
RequestParams parameters = new RequestParams();
|
RequestParams parameters = new RequestParams();
|
||||||
parameters.put(Helper.CLIENT_NAME, Helper.OAUTH_REDIRECT_HOST);
|
parameters.add(Helper.CLIENT_NAME, Helper.OAUTH_REDIRECT_HOST);
|
||||||
parameters.put(Helper.REDIRECT_URIS,"https://" + Helper.INSTANCE + Helper.REDIRECT_CONTENT);
|
parameters.add(Helper.REDIRECT_URIS, Helper.REDIRECT_CONTENT);
|
||||||
parameters.put(Helper.SCOPES, Helper.OAUTH_SCOPES);
|
parameters.add(Helper.SCOPES, Helper.OAUTH_SCOPES);
|
||||||
parameters.put(Helper.WEBSITE,"https://" + Helper.INSTANCE);
|
parameters.add(Helper.WEBSITE,"https://" + Helper.INSTANCE);
|
||||||
new OauthClient().post(action, parameters, new AsyncHttpResponseHandler() {
|
new OauthClient().post(action, parameters, new AsyncHttpResponseHandler() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
|
public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
|
||||||
|
@ -106,12 +114,53 @@ public class LoginActivity extends AppCompatActivity {
|
||||||
connectionButton.setOnClickListener(new View.OnClickListener() {
|
connectionButton.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
startActivity(webviewIntent);
|
connectionButton.setEnabled(false);
|
||||||
finish();
|
AsyncHttpClient client = new AsyncHttpClient();
|
||||||
|
RequestParams requestParams = new RequestParams();
|
||||||
|
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
|
requestParams.add(Helper.CLIENT_ID, sharedpreferences.getString(Helper.CLIENT_ID, null));
|
||||||
|
requestParams.add(Helper.CLIENT_SECRET, sharedpreferences.getString(Helper.CLIENT_SECRET, null));
|
||||||
|
requestParams.add("grant_type", "password");
|
||||||
|
EditText login_uid = (EditText) findViewById(R.id.login_uid);
|
||||||
|
EditText login_passwd = (EditText) findViewById(R.id.login_passwd);
|
||||||
|
requestParams.add("username",login_uid.getText().toString().trim());
|
||||||
|
requestParams.add("password",login_passwd.getText().toString().trim());
|
||||||
|
requestParams.add("scope"," read write follow");
|
||||||
|
client.setUserAgent(USER_AGENT);
|
||||||
|
try {
|
||||||
|
client.setSSLSocketFactory(new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()));
|
||||||
|
client.post("https://" + Helper.INSTANCE + "/oauth/token", requestParams, new AsyncHttpResponseHandler() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
|
||||||
|
String response = new String(responseBody);
|
||||||
|
JSONObject resobj;
|
||||||
|
try {
|
||||||
|
resobj = new JSONObject(response);
|
||||||
|
String token = resobj.get("access_token").toString();
|
||||||
|
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||||
|
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
|
||||||
|
editor.apply();
|
||||||
|
//Update the account with the token;
|
||||||
|
new UpdateAccountInfoAsyncTask(LoginActivity.this, token).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
|
} catch (JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
|
||||||
|
connectionButton.setEnabled(true);
|
||||||
|
Toast.makeText(getApplicationContext(),R.string.toast_error_login,Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (NoSuchAlgorithmException | KeyManagementException | UnrecoverableKeyException | KeyStoreException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -39,9 +39,6 @@ import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
|
|
||||||
import com.google.android.gms.common.GooglePlayServicesRepairableException;
|
|
||||||
import com.google.android.gms.security.ProviderInstaller;
|
|
||||||
import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
|
import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
|
||||||
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||||
|
@ -53,6 +50,7 @@ import java.util.HashMap;
|
||||||
|
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoByIDAsyncTask;
|
import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoByIDAsyncTask;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
||||||
|
import fr.gouv.etalab.mastodon.client.PatchBaseImageDownloader;
|
||||||
import fr.gouv.etalab.mastodon.fragments.DisplayAccountsFragment;
|
import fr.gouv.etalab.mastodon.fragments.DisplayAccountsFragment;
|
||||||
import fr.gouv.etalab.mastodon.fragments.DisplayNotificationsFragment;
|
import fr.gouv.etalab.mastodon.fragments.DisplayNotificationsFragment;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
|
@ -86,9 +84,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
try {
|
|
||||||
ProviderInstaller.installIfNeeded(this);
|
|
||||||
} catch (GooglePlayServicesRepairableException | GooglePlayServicesNotAvailableException ignored) {}
|
|
||||||
//Test if user is still log in
|
//Test if user is still log in
|
||||||
if( ! Helper.isLoggedIn(getApplicationContext())) {
|
if( ! Helper.isLoggedIn(getApplicationContext())) {
|
||||||
//It is not, the user is redirected to the login page
|
//It is not, the user is redirected to the login page
|
||||||
|
@ -124,6 +119,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
imageLoader = ImageLoader.getInstance();
|
imageLoader = ImageLoader.getInstance();
|
||||||
File cacheDir = new File(getCacheDir(), getString(R.string.app_name));
|
File cacheDir = new File(getCacheDir(), getString(R.string.app_name));
|
||||||
ImageLoaderConfiguration configImg = new ImageLoaderConfiguration.Builder(this)
|
ImageLoaderConfiguration configImg = new ImageLoaderConfiguration.Builder(this)
|
||||||
|
.imageDownloader(new PatchBaseImageDownloader(getApplicationContext()))
|
||||||
.threadPoolSize(5)
|
.threadPoolSize(5)
|
||||||
.threadPriority(Thread.MIN_PRIORITY + 3)
|
.threadPriority(Thread.MIN_PRIORITY + 3)
|
||||||
.denyCacheImageMultipleSizesInMemory()
|
.denyCacheImageMultipleSizesInMemory()
|
||||||
|
|
|
@ -246,7 +246,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
setTitle(account.getAcct());
|
setTitle(account.getAcct());
|
||||||
account_dn.setText(account.getDisplay_name());
|
account_dn.setText(account.getDisplay_name());
|
||||||
account_un.setText(account.getUsername());
|
account_un.setText(account.getUsername());
|
||||||
if( account.getAcct().equals(account.getUsername()))
|
if( account.getAcct() != null && account.getAcct().equals(account.getUsername()))
|
||||||
account_ac.setVisibility(View.GONE);
|
account_ac.setVisibility(View.GONE);
|
||||||
else
|
else
|
||||||
account_ac.setText(account.getAcct());
|
account_ac.setText(account.getAcct());
|
||||||
|
|
|
@ -1,212 +0,0 @@
|
||||||
/* Copyright 2017 Thomas Schneider
|
|
||||||
*
|
|
||||||
* This file is a part of Mastodon Etalab for mastodon.etalab.gouv.fr
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
|
||||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Mastodon Etalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
|
||||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
||||||
* Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
|
|
||||||
* see <http://www.gnu.org/licenses>. */
|
|
||||||
|
|
||||||
package fr.gouv.etalab.mastodon.activities;
|
|
||||||
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.net.http.SslError;
|
|
||||||
import android.os.AsyncTask;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.webkit.CookieManager;
|
|
||||||
import android.webkit.CookieSyncManager;
|
|
||||||
import android.webkit.HttpAuthHandler;
|
|
||||||
import android.webkit.SslErrorHandler;
|
|
||||||
import android.webkit.WebChromeClient;
|
|
||||||
import android.webkit.WebResourceResponse;
|
|
||||||
import android.webkit.WebSettings;
|
|
||||||
import android.webkit.WebView;
|
|
||||||
import android.webkit.WebViewClient;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
|
|
||||||
import com.loopj.android.http.AsyncHttpResponseHandler;
|
|
||||||
import com.loopj.android.http.RequestHandle;
|
|
||||||
import com.loopj.android.http.RequestParams;
|
|
||||||
import com.loopj.android.http.SyncHttpClient;
|
|
||||||
|
|
||||||
import org.json.JSONException;
|
|
||||||
import org.json.JSONObject;
|
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.security.KeyManagementException;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import javax.net.ssl.HttpsURLConnection;
|
|
||||||
import javax.net.ssl.SSLContext;
|
|
||||||
|
|
||||||
import cz.msebera.android.httpclient.Header;
|
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoAsyncTask;
|
|
||||||
import fr.gouv.etalab.mastodon.client.OauthClient;
|
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by Thomas on 24/04/2017.
|
|
||||||
* Webview to connect accounts
|
|
||||||
*/
|
|
||||||
public class WebviewActivity extends AppCompatActivity {
|
|
||||||
|
|
||||||
|
|
||||||
private WebView webView;
|
|
||||||
private AlertDialog alert;
|
|
||||||
private String clientId, clientSecret;
|
|
||||||
private WebResourceResponse webResourceResponse;
|
|
||||||
|
|
||||||
public void onCreate(Bundle savedInstanceState)
|
|
||||||
{
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.activity_webview);
|
|
||||||
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
|
||||||
clientId = sharedpreferences.getString(Helper.CLIENT_ID, null);
|
|
||||||
clientSecret = sharedpreferences.getString(Helper.CLIENT_SECRET, null);
|
|
||||||
|
|
||||||
webView = (WebView) findViewById(R.id.webviewConnect);
|
|
||||||
clearCookies(getApplicationContext());
|
|
||||||
final ProgressBar pbar = (ProgressBar) findViewById(R.id.progress_bar);
|
|
||||||
WebSettings settings = webView.getSettings();
|
|
||||||
settings.setJavaScriptEnabled(true);
|
|
||||||
settings.setDomStorageEnabled(true);
|
|
||||||
webView.setWebChromeClient(new WebChromeClient() {
|
|
||||||
@Override
|
|
||||||
public void onProgressChanged(WebView view, int progress) {
|
|
||||||
if (progress < 100 && pbar.getVisibility() == ProgressBar.GONE) {
|
|
||||||
pbar.setVisibility(ProgressBar.VISIBLE);
|
|
||||||
}
|
|
||||||
pbar.setProgress(progress);
|
|
||||||
if (progress == 100) {
|
|
||||||
pbar.setVisibility(ProgressBar.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
webView.setWebViewClient(new WebViewClient() {
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
@Override
|
|
||||||
public boolean shouldOverrideUrlLoading(WebView view, String url){
|
|
||||||
super.shouldOverrideUrlLoading(view,url);
|
|
||||||
if( url.contains(Helper.REDIRECT_CONTENT)){
|
|
||||||
String val[] = url.split("code=");
|
|
||||||
String code = val[1];
|
|
||||||
|
|
||||||
String action = "/oauth/token";
|
|
||||||
RequestParams parameters = new RequestParams();
|
|
||||||
parameters.add(Helper.CLIENT_ID, clientId);
|
|
||||||
parameters.add(Helper.CLIENT_SECRET, clientSecret);
|
|
||||||
parameters.add(Helper.REDIRECT_URI,"https://" + Helper.INSTANCE + Helper.REDIRECT_CONTENT);
|
|
||||||
parameters.add("grant_type", "authorization_code");
|
|
||||||
parameters.add("code",code);
|
|
||||||
new OauthClient().post(action, parameters, new AsyncHttpResponseHandler() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
|
|
||||||
String response = new String(responseBody);
|
|
||||||
JSONObject resobj;
|
|
||||||
try {
|
|
||||||
resobj = new JSONObject(response);
|
|
||||||
String token = resobj.get("access_token").toString();
|
|
||||||
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
|
||||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
|
||||||
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
|
|
||||||
editor.apply();
|
|
||||||
//Update the account with the token;
|
|
||||||
new UpdateAccountInfoAsyncTask(WebviewActivity.this, true, token).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
|
||||||
} catch (JSONException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
|
|
||||||
error.printStackTrace();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
webView.loadUrl(redirectUserToAuthorizeAndLogin());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
if (webView != null && webView.canGoBack()) {
|
|
||||||
webView.goBack();
|
|
||||||
} else {
|
|
||||||
super.onBackPressed();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private String redirectUserToAuthorizeAndLogin() {
|
|
||||||
|
|
||||||
String queryString = Helper.CLIENT_ID + "="+ clientId;
|
|
||||||
queryString += "&" + Helper.REDIRECT_URI + "="+ Uri.encode("https://" + Helper.INSTANCE + "/redirect_mastodon_api");
|
|
||||||
queryString += "&" + Helper.RESPONSE_TYPE +"=code";
|
|
||||||
queryString += "&" + Helper.SCOPE +"=" + Helper.OAUTH_SCOPES;
|
|
||||||
/*try {
|
|
||||||
queryString = URLEncoder.encode(queryString, "utf-8");
|
|
||||||
} catch (UnsupportedEncodingException ignored) {}*/
|
|
||||||
return "https://" + Helper.INSTANCE + Helper.EP_AUTHORIZE + "?" + queryString;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
if (alert != null) {
|
|
||||||
alert.dismiss();
|
|
||||||
alert = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public static void clearCookies(Context context)
|
|
||||||
{
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
|
|
||||||
CookieManager.getInstance().removeAllCookies(null);
|
|
||||||
CookieManager.getInstance().flush();
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
CookieSyncManager cookieSyncMngr=CookieSyncManager.createInstance(context);
|
|
||||||
cookieSyncMngr.startSync();
|
|
||||||
CookieManager cookieManager=CookieManager.getInstance();
|
|
||||||
cookieManager.removeAllCookie();
|
|
||||||
cookieManager.removeSessionCookie();
|
|
||||||
cookieSyncMngr.stopSync();
|
|
||||||
cookieSyncMngr.sync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -20,13 +20,11 @@ import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.database.sqlite.SQLiteDatabase;
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import fr.gouv.etalab.mastodon.activities.MainActivity;
|
import fr.gouv.etalab.mastodon.activities.MainActivity;
|
||||||
import fr.gouv.etalab.mastodon.client.API;
|
import fr.gouv.etalab.mastodon.client.API;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
import fr.gouv.etalab.mastodon.interfaces.OnUpdateAccountInfoInterface;
|
|
||||||
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
|
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
|
||||||
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
||||||
|
|
||||||
|
@ -39,22 +37,11 @@ public class UpdateAccountInfoAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
|
||||||
private Context context;
|
private Context context;
|
||||||
private String token;
|
private String token;
|
||||||
private boolean fromWebview;
|
|
||||||
private boolean error;
|
|
||||||
private OnUpdateAccountInfoInterface listener;
|
|
||||||
|
|
||||||
public UpdateAccountInfoAsyncTask(Context context, String token, OnUpdateAccountInfoInterface onUpdateAccountInfoInterface){
|
|
||||||
|
public UpdateAccountInfoAsyncTask(Context context, String token){
|
||||||
this.context = context;
|
this.context = context;
|
||||||
this.token = token;
|
this.token = token;
|
||||||
this.fromWebview = false;
|
|
||||||
this.error = false;
|
|
||||||
this.listener = onUpdateAccountInfoInterface;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UpdateAccountInfoAsyncTask(Context context, boolean fromWebview, String token){
|
|
||||||
this.context = context;
|
|
||||||
this.token = token;
|
|
||||||
this.fromWebview = fromWebview;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,8 +65,6 @@ public class UpdateAccountInfoAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
else {
|
else {
|
||||||
if( account.getUsername() != null && account.getCreated_at() != null)
|
if( account.getUsername() != null && account.getCreated_at() != null)
|
||||||
new AccountDAO(context, db).insertAccount(account);
|
new AccountDAO(context, db).insertAccount(account);
|
||||||
else //Here the user credential in db doesn't match the remote one (it will be disconnected)
|
|
||||||
error = true;
|
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -87,14 +72,10 @@ public class UpdateAccountInfoAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
@Override
|
@Override
|
||||||
protected void onPostExecute(Void result) {
|
protected void onPostExecute(Void result) {
|
||||||
|
|
||||||
if( fromWebview){
|
Intent mainActivity = new Intent(context, MainActivity.class);
|
||||||
Intent mainActivity = new Intent(context, MainActivity.class);
|
mainActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
mainActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
context.startActivity(mainActivity);
|
||||||
context.startActivity(mainActivity);
|
((Activity) context).finish();
|
||||||
((Activity) context).finish();
|
|
||||||
}else{
|
|
||||||
listener.onUpdateAccountInfo(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.client;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.loopj.android.http.AsyncHttpResponseHandler;
|
import com.loopj.android.http.AsyncHttpResponseHandler;
|
||||||
import com.loopj.android.http.JsonHttpResponseHandler;
|
import com.loopj.android.http.JsonHttpResponseHandler;
|
||||||
|
@ -44,6 +45,7 @@ import fr.gouv.etalab.mastodon.client.Entities.Attachment;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Notification;
|
import fr.gouv.etalab.mastodon.client.Entities.Notification;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Relationship;
|
import fr.gouv.etalab.mastodon.client.Entities.Relationship;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
||||||
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
|
|
||||||
import static fr.gouv.etalab.mastodon.helper.Helper.USER_AGENT;
|
import static fr.gouv.etalab.mastodon.helper.Helper.USER_AGENT;
|
||||||
|
|
||||||
|
@ -1156,28 +1158,49 @@ public class API {
|
||||||
|
|
||||||
|
|
||||||
private void get(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
private void get(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
||||||
client.setTimeout(10000);
|
try {
|
||||||
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
client.setConnectTimeout(10000); //10s timeout
|
||||||
String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
|
client.setUserAgent(USER_AGENT);
|
||||||
client.addHeader("Authorization", "Bearer "+prefKeyOauthTokenT);
|
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
client.setUserAgent(USER_AGENT);
|
String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
|
||||||
client.get(getAbsoluteUrl(action), params, responseHandler);
|
client.addHeader("Authorization", "Bearer "+prefKeyOauthTokenT);
|
||||||
|
client.setSSLSocketFactory(new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()));
|
||||||
|
client.get(getAbsoluteUrl(action), params, responseHandler);
|
||||||
|
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | UnrecoverableKeyException e) {
|
||||||
|
Toast.makeText(context, R.string.toast_error,Toast.LENGTH_LONG).show();
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void post(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
private void post(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
||||||
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
|
||||||
String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
|
try {
|
||||||
client.addHeader("Authorization", "Bearer "+prefKeyOauthTokenT);
|
client.setConnectTimeout(10000); //10s timeout
|
||||||
client.setUserAgent(USER_AGENT);
|
client.setUserAgent(USER_AGENT);
|
||||||
client.post(getAbsoluteUrl(action), params, responseHandler);
|
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
|
String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
|
||||||
|
client.addHeader("Authorization", "Bearer "+prefKeyOauthTokenT);
|
||||||
|
client.setSSLSocketFactory(new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()));
|
||||||
|
client.post(getAbsoluteUrl(action), params, responseHandler);
|
||||||
|
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | UnrecoverableKeyException e) {
|
||||||
|
Toast.makeText(context, R.string.toast_error,Toast.LENGTH_LONG).show();
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void delete(String action, RequestParams params, AsyncHttpResponseHandler responseHandler){
|
private void delete(String action, RequestParams params, AsyncHttpResponseHandler responseHandler){
|
||||||
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
try {
|
||||||
String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
|
client.setConnectTimeout(10000); //10s timeout
|
||||||
client.addHeader("Authorization", "Bearer "+prefKeyOauthTokenT);
|
client.setUserAgent(USER_AGENT);
|
||||||
client.setUserAgent(USER_AGENT);
|
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
client.delete(getAbsoluteUrl(action), params, responseHandler);
|
String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
|
||||||
|
client.addHeader("Authorization", "Bearer "+prefKeyOauthTokenT);
|
||||||
|
client.setSSLSocketFactory(new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()));
|
||||||
|
client.delete(getAbsoluteUrl(action), params, responseHandler);
|
||||||
|
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | UnrecoverableKeyException e) {
|
||||||
|
Toast.makeText(context, R.string.toast_error,Toast.LENGTH_LONG).show();
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getAbsoluteUrl(String action) {
|
private String getAbsoluteUrl(String action) {
|
||||||
|
|
|
@ -18,9 +18,11 @@ package fr.gouv.etalab.mastodon.client;
|
||||||
import com.loopj.android.http.AsyncHttpClient;
|
import com.loopj.android.http.AsyncHttpClient;
|
||||||
import com.loopj.android.http.AsyncHttpResponseHandler;
|
import com.loopj.android.http.AsyncHttpResponseHandler;
|
||||||
import com.loopj.android.http.RequestParams;
|
import com.loopj.android.http.RequestParams;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
import java.security.KeyManagementException;
|
||||||
import java.util.Map;
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.UnrecoverableKeyException;
|
||||||
|
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
|
|
||||||
|
@ -38,16 +40,26 @@ public class OauthClient {
|
||||||
private static AsyncHttpClient client = new AsyncHttpClient();
|
private static AsyncHttpClient client = new AsyncHttpClient();
|
||||||
|
|
||||||
public void get(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
public void get(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
||||||
client.setTimeout(5000);
|
try {
|
||||||
client.setUserAgent(USER_AGENT);
|
client.setConnectTimeout(10000); //10s timeout
|
||||||
client.post(getAbsoluteUrl(action), params, responseHandler);
|
client.setUserAgent(USER_AGENT);
|
||||||
client.get(getAbsoluteUrl(action), params, responseHandler);
|
client.setSSLSocketFactory(new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()));
|
||||||
|
client.get(getAbsoluteUrl(action), params, responseHandler);
|
||||||
|
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | UnrecoverableKeyException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void post(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
public void post(String action, RequestParams params, AsyncHttpResponseHandler responseHandler) {
|
||||||
client.setConnectTimeout(30000); //30s timeout
|
try {
|
||||||
client.setUserAgent(USER_AGENT);
|
client.setConnectTimeout(10000); //10s timeout
|
||||||
client.post(getAbsoluteUrl(action), params, responseHandler);
|
client.setUserAgent(USER_AGENT);
|
||||||
|
client.setSSLSocketFactory(new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()));
|
||||||
|
client.post(getAbsoluteUrl(action), params, responseHandler);
|
||||||
|
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | UnrecoverableKeyException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getAbsoluteUrl(String action) {
|
private String getAbsoluteUrl(String action) {
|
||||||
|
|
|
@ -0,0 +1,127 @@
|
||||||
|
package fr.gouv.etalab.mastodon.client;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import com.nostra13.universalimageloader.core.assist.ContentLengthInputStream;
|
||||||
|
import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
|
||||||
|
|
||||||
|
import java.io.BufferedInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.Socket;
|
||||||
|
import java.security.cert.CertificateException;
|
||||||
|
import java.security.cert.X509Certificate;
|
||||||
|
|
||||||
|
import javax.net.ssl.HttpsURLConnection;
|
||||||
|
import javax.net.ssl.SSLContext;
|
||||||
|
import javax.net.ssl.SSLSocket;
|
||||||
|
import javax.net.ssl.SSLSocketFactory;
|
||||||
|
import javax.net.ssl.TrustManager;
|
||||||
|
import javax.net.ssl.X509TrustManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by Thomas on 21/05/2017.
|
||||||
|
* Patch for universal image loader to support TLS 1.1+
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class PatchBaseImageDownloader extends BaseImageDownloader {
|
||||||
|
|
||||||
|
private SSLSocketFactory sf;
|
||||||
|
|
||||||
|
public PatchBaseImageDownloader(Context context) {
|
||||||
|
super(context);
|
||||||
|
|
||||||
|
initSSLSocketFactory();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initSSLSocketFactory() {
|
||||||
|
sf = (SSLSocketFactory) SSLSocketFactory.getDefault();
|
||||||
|
try {
|
||||||
|
sf = new MySSLSocketFactory();
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public InputStream getStreamFromNetwork(String imageUri, Object extra) throws IOException {
|
||||||
|
HttpURLConnection conn = createConnection(imageUri, extra);
|
||||||
|
if (conn instanceof HttpsURLConnection) {
|
||||||
|
((HttpsURLConnection) conn).setSSLSocketFactory(sf);
|
||||||
|
}
|
||||||
|
return new ContentLengthInputStream(new BufferedInputStream(conn.getInputStream(), BUFFER_SIZE), conn.getContentLength());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class MySSLSocketFactory extends SSLSocketFactory {
|
||||||
|
SSLContext sslContext = SSLContext.getInstance("TLS");
|
||||||
|
|
||||||
|
MySSLSocketFactory() throws Exception {
|
||||||
|
super();
|
||||||
|
TrustManager tm = new X509TrustManager() {
|
||||||
|
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
|
||||||
|
}
|
||||||
|
|
||||||
|
public X509Certificate[] getAcceptedIssuers() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
sslContext.init(null, new TrustManager[]{tm}, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String[] getDefaultCipherSuites() {
|
||||||
|
return new String[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String[] getSupportedCipherSuites() {
|
||||||
|
return new String[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket(String host, int port) throws IOException {
|
||||||
|
return enableTLSOnSocket(sslContext.getSocketFactory().createSocket(host, port));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
|
||||||
|
return enableTLSOnSocket(sslContext.getSocketFactory().createSocket(host, port, localHost, localPort));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket(InetAddress host, int port) throws IOException {
|
||||||
|
return enableTLSOnSocket(sslContext.getSocketFactory().createSocket(host, port));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
|
||||||
|
return enableTLSOnSocket(sslContext.getSocketFactory().createSocket(address, port, localAddress, localPort));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException {
|
||||||
|
return enableTLSOnSocket(sslContext.getSocketFactory().createSocket(socket, host, port, autoClose));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket() throws IOException {
|
||||||
|
return enableTLSOnSocket(sslContext.getSocketFactory().createSocket());
|
||||||
|
}
|
||||||
|
|
||||||
|
private Socket enableTLSOnSocket(Socket socket) {
|
||||||
|
if(socket != null && (socket instanceof SSLSocket)) {
|
||||||
|
((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
|
||||||
|
}
|
||||||
|
return socket;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -212,9 +212,6 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou
|
||||||
}
|
}
|
||||||
swipeRefreshLayout.setRefreshing(false);
|
swipeRefreshLayout.setRefreshing(false);
|
||||||
firstLoad = false;
|
firstLoad = false;
|
||||||
if( accounts != null && accounts.size() < accountPerPage )
|
flag_loading = accounts != null && accounts.size() < accountPerPage;
|
||||||
flag_loading = true;
|
|
||||||
else
|
|
||||||
flag_loading = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ package fr.gouv.etalab.mastodon.fragments;
|
||||||
* see <http://www.gnu.org/licenses>. */
|
* see <http://www.gnu.org/licenses>. */
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
|
@ -29,8 +30,11 @@ import android.widget.RelativeLayout;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
||||||
import fr.gouv.etalab.mastodon.drawers.NotificationsListAdapter;
|
import fr.gouv.etalab.mastodon.drawers.NotificationsListAdapter;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
|
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
||||||
|
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.RetrieveNotificationsAsyncTask;
|
import fr.gouv.etalab.mastodon.asynctasks.RetrieveNotificationsAsyncTask;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Notification;
|
import fr.gouv.etalab.mastodon.client.Entities.Notification;
|
||||||
|
@ -162,9 +166,19 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
|
||||||
}
|
}
|
||||||
swipeRefreshLayout.setRefreshing(false);
|
swipeRefreshLayout.setRefreshing(false);
|
||||||
firstLoad = false;
|
firstLoad = false;
|
||||||
if( notifications != null && notifications.size() < notificationPerPage )
|
flag_loading = notifications != null && notifications.size() < notificationPerPage;
|
||||||
flag_loading = true;
|
//Store last notification id to avoid to notify for those that have been already seen
|
||||||
else
|
if( notifications != null && notifications.size() > 0) {
|
||||||
flag_loading = false;
|
final SharedPreferences sharedpreferences = getContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
|
//acct is null when used in Fragment, data need to be retrieved via shared preferences and db
|
||||||
|
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
|
||||||
|
SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
|
||||||
|
Account currentAccount = new AccountDAO(context, db).getAccountByID(userId);
|
||||||
|
if( currentAccount != null){
|
||||||
|
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||||
|
editor.putString(Helper.LAST_NOTIFICATION_MAX_ID + currentAccount.getAcct(), notifications.get(0).getId());
|
||||||
|
editor.apply();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,11 +16,13 @@ package fr.gouv.etalab.mastodon.fragments;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
import android.support.v4.content.LocalBroadcastManager;
|
import android.support.v4.content.LocalBroadcastManager;
|
||||||
import android.support.v4.widget.SwipeRefreshLayout;
|
import android.support.v4.widget.SwipeRefreshLayout;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
@ -33,8 +35,11 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
||||||
import fr.gouv.etalab.mastodon.drawers.StatusListAdapter;
|
import fr.gouv.etalab.mastodon.drawers.StatusListAdapter;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
|
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
||||||
|
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.RetrieveFeedsAsyncTask;
|
import fr.gouv.etalab.mastodon.asynctasks.RetrieveFeedsAsyncTask;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
||||||
|
@ -61,6 +66,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
private String targetedId;
|
private String targetedId;
|
||||||
private String tag;
|
private String tag;
|
||||||
private boolean hideHeader = false;
|
private boolean hideHeader = false;
|
||||||
|
private int tootsPerPage;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
@ -85,7 +91,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);
|
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);
|
||||||
|
|
||||||
final ListView lv_status = (ListView) rootView.findViewById(R.id.lv_status);
|
final ListView lv_status = (ListView) rootView.findViewById(R.id.lv_status);
|
||||||
|
tootsPerPage = sharedpreferences.getInt(Helper.SET_TOOTS_PER_PAGE, 40);
|
||||||
mainLoader = (RelativeLayout) rootView.findViewById(R.id.loader);
|
mainLoader = (RelativeLayout) rootView.findViewById(R.id.loader);
|
||||||
nextElementLoader = (RelativeLayout) rootView.findViewById(R.id.loading_next_status);
|
nextElementLoader = (RelativeLayout) rootView.findViewById(R.id.loading_next_status);
|
||||||
textviewNoAction = (RelativeLayout) rootView.findViewById(R.id.no_action);
|
textviewNoAction = (RelativeLayout) rootView.findViewById(R.id.no_action);
|
||||||
|
@ -99,13 +105,12 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
|
|
||||||
}
|
}
|
||||||
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
|
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
|
||||||
|
|
||||||
if(firstVisibleItem + visibleItemCount == totalItemCount ) {
|
if(firstVisibleItem + visibleItemCount == totalItemCount ) {
|
||||||
if(!flag_loading ) {
|
if(!flag_loading ) {
|
||||||
flag_loading = true;
|
flag_loading = true;
|
||||||
if( type == RetrieveFeedsAsyncTask.Type.USER)
|
if( type == RetrieveFeedsAsyncTask.Type.USER)
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
if( type == RetrieveFeedsAsyncTask.Type.TAG)
|
else if( type == RetrieveFeedsAsyncTask.Type.TAG)
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
else
|
else
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
|
@ -156,7 +161,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
flag_loading = true;
|
flag_loading = true;
|
||||||
if( type == RetrieveFeedsAsyncTask.Type.USER)
|
if( type == RetrieveFeedsAsyncTask.Type.USER)
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
if( type == RetrieveFeedsAsyncTask.Type.TAG)
|
else if( type == RetrieveFeedsAsyncTask.Type.TAG)
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
else
|
else
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
|
@ -169,7 +174,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
|
|
||||||
if( type == RetrieveFeedsAsyncTask.Type.USER)
|
if( type == RetrieveFeedsAsyncTask.Type.USER)
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
if( type == RetrieveFeedsAsyncTask.Type.TAG)
|
else if( type == RetrieveFeedsAsyncTask.Type.TAG)
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
else
|
else
|
||||||
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
|
@ -203,7 +208,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRetrieveFeeds(List<Status> statuses) {
|
public void onRetrieveFeeds(List<Status> statuses) {
|
||||||
|
|
||||||
if( firstLoad && (statuses == null || statuses.size() == 0))
|
if( firstLoad && (statuses == null || statuses.size() == 0))
|
||||||
textviewNoAction.setVisibility(View.VISIBLE);
|
textviewNoAction.setVisibility(View.VISIBLE);
|
||||||
else
|
else
|
||||||
|
@ -223,7 +227,20 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
}
|
}
|
||||||
swipeRefreshLayout.setRefreshing(false);
|
swipeRefreshLayout.setRefreshing(false);
|
||||||
firstLoad = false;
|
firstLoad = false;
|
||||||
flag_loading = false;
|
flag_loading = statuses != null && statuses.size() < tootsPerPage;
|
||||||
|
//Store last toot id for home timeline to avoid to notify for those that have been already seen
|
||||||
|
if(statuses != null && statuses.size() > 0 && type == RetrieveFeedsAsyncTask.Type.HOME ){
|
||||||
|
final SharedPreferences sharedpreferences = getContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
|
//acct is null when used in Fragment, data need to be retrieved via shared preferences and db
|
||||||
|
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
|
||||||
|
SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
|
||||||
|
Account currentAccount = new AccountDAO(context, db).getAccountByID(userId);
|
||||||
|
if( currentAccount != null){
|
||||||
|
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||||
|
editor.putString(Helper.LAST_HOMETIMELINE_MAX_ID + currentAccount.getAcct(), statuses.get(0).getId());
|
||||||
|
editor.apply();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class Helper {
|
||||||
public static final String OAUTH_SCOPES = "read write follow";
|
public static final String OAUTH_SCOPES = "read write follow";
|
||||||
public static final String PREF_KEY_OAUTH_TOKEN = "oauth_token";
|
public static final String PREF_KEY_OAUTH_TOKEN = "oauth_token";
|
||||||
public static final String PREF_KEY_ID = "userID";
|
public static final String PREF_KEY_ID = "userID";
|
||||||
public static final String REDIRECT_CONTENT = "/redirect_mastodon_api";
|
public static final String REDIRECT_CONTENT = "urn:ietf:wg:oauth:2.0:oob";
|
||||||
public static final int EXTERNAL_STORAGE_REQUEST_CODE = 84;
|
public static final int EXTERNAL_STORAGE_REQUEST_CODE = 84;
|
||||||
|
|
||||||
//Some definitions
|
//Some definitions
|
||||||
|
|
|
@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit;
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.RetrieveHomeTimelineServiceAsyncTask;
|
import fr.gouv.etalab.mastodon.asynctasks.RetrieveHomeTimelineServiceAsyncTask;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
||||||
|
import fr.gouv.etalab.mastodon.client.PatchBaseImageDownloader;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
import fr.gouv.etalab.mastodon.interfaces.OnRetrieveHomeTimelineServiceInterface;
|
import fr.gouv.etalab.mastodon.interfaces.OnRetrieveHomeTimelineServiceInterface;
|
||||||
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
||||||
|
@ -124,7 +125,8 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe
|
||||||
String title = null;
|
String title = null;
|
||||||
for(Status status: statuses){
|
for(Status status: statuses){
|
||||||
//The notification associated to max_id is discarded as it is supposed to have already been sent
|
//The notification associated to max_id is discarded as it is supposed to have already been sent
|
||||||
if( status.getId().equals(max_id))
|
//Also, if the toot comes from the owner, we will avoid to warn him/her...
|
||||||
|
if( status.getId().equals(max_id) || status.getAccount().getAcct().trim().equals(acct.trim()))
|
||||||
continue;
|
continue;
|
||||||
String notificationUrl = status.getAccount().getAvatar();
|
String notificationUrl = status.getAccount().getAvatar();
|
||||||
if( notificationUrl != null && icon_notification == null){
|
if( notificationUrl != null && icon_notification == null){
|
||||||
|
@ -132,6 +134,7 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe
|
||||||
ImageLoader imageLoaderNoty = ImageLoader.getInstance();
|
ImageLoader imageLoaderNoty = ImageLoader.getInstance();
|
||||||
File cacheDir = new File(getContext().getCacheDir(), getContext().getString(R.string.app_name));
|
File cacheDir = new File(getContext().getCacheDir(), getContext().getString(R.string.app_name));
|
||||||
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getContext())
|
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getContext())
|
||||||
|
.imageDownloader(new PatchBaseImageDownloader(getContext()))
|
||||||
.threadPoolSize(5)
|
.threadPoolSize(5)
|
||||||
.threadPriority(Thread.MIN_PRIORITY + 3)
|
.threadPriority(Thread.MIN_PRIORITY + 3)
|
||||||
.denyCacheImageMultipleSizesInMemory()
|
.denyCacheImageMultipleSizesInMemory()
|
||||||
|
|
|
@ -36,6 +36,7 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import fr.gouv.etalab.mastodon.client.PatchBaseImageDownloader;
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.RetrieveNotificationsAsyncTask;
|
import fr.gouv.etalab.mastodon.asynctasks.RetrieveNotificationsAsyncTask;
|
||||||
|
@ -190,6 +191,7 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
|
||||||
ImageLoader imageLoaderNoty = ImageLoader.getInstance();
|
ImageLoader imageLoaderNoty = ImageLoader.getInstance();
|
||||||
File cacheDir = new File(getContext().getCacheDir(), getContext().getString(R.string.app_name));
|
File cacheDir = new File(getContext().getCacheDir(), getContext().getString(R.string.app_name));
|
||||||
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getContext())
|
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getContext())
|
||||||
|
.imageDownloader(new PatchBaseImageDownloader(getContext()))
|
||||||
.threadPoolSize(5)
|
.threadPoolSize(5)
|
||||||
.threadPriority(Thread.MIN_PRIORITY + 3)
|
.threadPriority(Thread.MIN_PRIORITY + 3)
|
||||||
.denyCacheImageMultipleSizesInMemory()
|
.denyCacheImageMultipleSizesInMemory()
|
||||||
|
|
|
@ -50,14 +50,14 @@
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:layout_weight="3"
|
android:layout_weight="2"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:text="@string/about_developer"
|
android:text="@string/about_developer"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/about_developer"
|
android:id="@+id/about_developer"
|
||||||
android:text="@string/about_developer_action"
|
android:text="@string/about_developer_action"
|
||||||
android:layout_weight="2"
|
android:layout_weight="3"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
style="@style/Base.Widget.AppCompat.Button.Colored"
|
style="@style/Base.Widget.AppCompat.Button.Colored"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
@ -74,14 +74,14 @@
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:layout_weight="3"
|
android:layout_weight="2"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/about_license"
|
android:id="@+id/about_license"
|
||||||
android:text="@string/about_license_action"
|
android:text="@string/about_license_action"
|
||||||
style="@style/Base.Widget.AppCompat.Button.Colored"
|
style="@style/Base.Widget.AppCompat.Button.Colored"
|
||||||
android:layout_weight="2"
|
android:layout_weight="3"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -97,14 +97,14 @@
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:layout_weight="3"
|
android:layout_weight="2"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/about_code"
|
android:id="@+id/about_code"
|
||||||
android:text="@string/about_code_action"
|
android:text="@string/about_code_action"
|
||||||
style="@style/Base.Widget.AppCompat.Button.Colored"
|
style="@style/Base.Widget.AppCompat.Button.Colored"
|
||||||
android:layout_weight="2"
|
android:layout_weight="3"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -24,25 +24,41 @@
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
>
|
>
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="wrap_content"
|
android:layout_marginTop="20dp"
|
||||||
|
android:layout_width="100dp"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:padding="20dp"
|
|
||||||
android:layout_weight="2"
|
|
||||||
android:src="@drawable/mastodonlogo"
|
android:src="@drawable/mastodonlogo"
|
||||||
android:layout_height="0dp"
|
android:layout_height="100dp"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_weight="1"
|
android:layout_margin="50dp"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/login_uid"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:inputType="textEmailAddress"
|
||||||
|
android:hint="@string/email"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id = "@+id/login_passwd"
|
||||||
|
android:inputType="textPassword"
|
||||||
|
android:hint="@string/password"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
/>
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/login_button"
|
android:id="@+id/login_button"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:drawableLeft="@drawable/mastodon_icon"
|
android:drawableLeft="@drawable/mastodon_icon"
|
||||||
android:drawableStart="@drawable/mastodon_icon"
|
android:drawableStart="@drawable/mastodon_icon"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
android:drawablePadding="10dp"
|
android:drawablePadding="10dp"
|
||||||
android:paddingLeft="15dp"
|
android:paddingLeft="15dp"
|
||||||
android:paddingStart="15dp"
|
android:paddingStart="15dp"
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
android:padding="5dp"
|
android:padding="5dp"
|
||||||
android:text="@string/cw"
|
android:text="@string/cw"
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
|
style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="40dp"
|
||||||
android:layout_height="40dp" />
|
android:layout_height="40dp" />
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/toot_space_left"
|
android:id="@+id/toot_space_left"
|
||||||
|
|
|
@ -25,194 +25,203 @@
|
||||||
android:paddingRight="@dimen/drawer_padding"
|
android:paddingRight="@dimen/drawer_padding"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:id="@+id/main_container"
|
android:id="@+id/main_container"
|
||||||
android:orientation="horizontal">
|
android:orientation="vertical">
|
||||||
<ImageView
|
|
||||||
android:id="@+id/status_account_profile"
|
|
||||||
android:layout_height="50dp"
|
|
||||||
android:layout_width="50dp"
|
|
||||||
android:layout_gravity="center_horizontal|top"
|
|
||||||
android:gravity="center_horizontal|top"
|
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_marginStart="5dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginLeft="5dp"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="horizontal">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/status_account_profile"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_gravity="center_horizontal|top"
|
||||||
|
android:gravity="center_horizontal|top"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_marginLeft="5dp"
|
||||||
android:layout_height="wrap_content">
|
android:layout_width="0dp"
|
||||||
<TextView
|
android:layout_weight="1"
|
||||||
android:id="@+id/status_account_displayname"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="16sp"
|
android:orientation="vertical">
|
||||||
android:textStyle="bold"
|
<LinearLayout
|
||||||
android:drawablePadding="2dp"
|
android:orientation="horizontal"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/status_account_displayname"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:drawablePadding="2dp"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<TextView
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:id="@+id/status_account_username"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
<TextView
|
<TextView
|
||||||
|
android:visibility="gone"
|
||||||
android:layout_marginLeft="5dp"
|
android:layout_marginLeft="5dp"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:textStyle="bold"
|
android:maxLines="1"
|
||||||
android:id="@+id/status_account_username"
|
android:id="@+id/status_reblog_user"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/status_toot_date"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:paddingRight="10dp"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:layout_gravity="end"
|
||||||
|
android:gravity="end"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/status_content"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:autoLink="web"
|
||||||
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
|
||||||
<TextView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_marginLeft="5dp"
|
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:textSize="14sp"
|
|
||||||
android:id="@+id/status_reblog_user"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/status_toot_date"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:paddingRight="10dp"
|
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:gravity="end"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/status_content"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:autoLink="web"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/status_document_container"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="200dp">
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/status_prev1"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="vertical"
|
android:id="@+id/status_document_container"
|
||||||
android:layout_width="0dp"
|
android:orientation="horizontal"
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginStart="2dp"
|
android:layout_height="200dp">
|
||||||
android:id="@+id/status_container2"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/status_prev2"
|
android:id="@+id/status_prev1"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:layout_height="0dp"
|
android:layout_height="match_parent"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_marginLeft="2dp"
|
||||||
|
android:layout_marginStart="2dp"
|
||||||
|
android:id="@+id/status_container2"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_marginTop="2dp"
|
|
||||||
android:id="@+id/status_container3"
|
|
||||||
android:layout_height="0dp">
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/status_prev3"
|
android:id="@+id/status_prev2"
|
||||||
|
android:layout_width="match_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:layout_width="0dp"
|
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="0dp"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
<ImageView
|
<LinearLayout
|
||||||
android:layout_marginLeft="2dp"
|
|
||||||
android:layout_marginStart="2dp"
|
|
||||||
android:id="@+id/status_prev4"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:scaleType="centerCrop"
|
android:orientation="horizontal"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginTop="2dp"
|
||||||
tools:ignore="ContentDescription" />
|
android:id="@+id/status_container3"
|
||||||
|
android:layout_height="0dp">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/status_prev3"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
<ImageView
|
||||||
|
android:layout_marginLeft="2dp"
|
||||||
|
android:layout_marginStart="2dp"
|
||||||
|
android:id="@+id/status_prev4"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
<Button
|
||||||
|
android:id="@+id/status_show_more"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:textAllCaps="false"
|
||||||
|
android:drawableLeft="@drawable/ic_photo"
|
||||||
|
android:drawableStart="@drawable/ic_photo"
|
||||||
|
android:gravity="center"
|
||||||
|
android:drawablePadding="5dp"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingRight="10dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/load_attachment" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<Button
|
</LinearLayout>
|
||||||
android:id="@+id/status_show_more"
|
<LinearLayout
|
||||||
android:visibility="gone"
|
android:id="@+id/status_action_container"
|
||||||
android:textAllCaps="false"
|
android:layout_width="match_parent"
|
||||||
android:drawableLeft="@drawable/ic_photo"
|
android:layout_height="wrap_content"
|
||||||
android:drawableStart="@drawable/ic_photo"
|
android:paddingTop="5dp"
|
||||||
android:gravity="center"
|
android:paddingLeft="@dimen/drawer_padding"
|
||||||
android:drawablePadding="5dp"
|
android:paddingRight="@dimen/drawer_padding"
|
||||||
android:paddingLeft="10dp"
|
android:orientation="horizontal">
|
||||||
android:paddingStart="10dp"
|
<TextView
|
||||||
android:paddingRight="10dp"
|
android:drawableStart="@drawable/dr_favorites"
|
||||||
android:paddingEnd="10dp"
|
android:drawableLeft="@drawable/dr_favorites"
|
||||||
android:paddingTop="5dp"
|
android:drawablePadding="2dp"
|
||||||
android:paddingBottom="5dp"
|
android:layout_gravity="center_vertical"
|
||||||
android:maxLines="1"
|
android:gravity="center_vertical"
|
||||||
|
android:id="@+id/status_favorite_count"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content" />
|
||||||
android:text="@string/load_attachment" />
|
<TextView
|
||||||
|
android:layout_marginLeft="30dp"
|
||||||
|
android:layout_marginStart="30dp"
|
||||||
|
android:drawableStart="@drawable/dr_reblogs"
|
||||||
|
android:drawableLeft="@drawable/dr_reblogs"
|
||||||
|
android:drawablePadding="2dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:id="@+id/status_reblog_count"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<ImageView
|
||||||
|
android:layout_marginLeft="30dp"
|
||||||
|
android:layout_marginStart="30dp"
|
||||||
|
android:id="@+id/status_reply"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:src="@drawable/ic_reply"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/status_action_container"
|
android:layout_width="0dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_weight="1"
|
||||||
android:layout_height="wrap_content"
|
android:layout_gravity="end"
|
||||||
android:paddingTop="5dp"
|
android:gravity="end"
|
||||||
android:orientation="horizontal">
|
android:paddingRight="10dp"
|
||||||
<TextView
|
android:paddingLeft="10dp"
|
||||||
android:drawableStart="@drawable/dr_favorites"
|
android:layout_height="wrap_content">
|
||||||
android:drawableLeft="@drawable/dr_favorites"
|
|
||||||
android:drawablePadding="2dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:id="@+id/status_favorite_count"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<TextView
|
|
||||||
android:layout_marginLeft="30dp"
|
|
||||||
android:layout_marginStart="30dp"
|
|
||||||
android:drawableStart="@drawable/dr_reblogs"
|
|
||||||
android:drawableLeft="@drawable/dr_reblogs"
|
|
||||||
android:drawablePadding="2dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:id="@+id/status_reblog_count"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_marginLeft="30dp"
|
android:layout_marginRight="20dp"
|
||||||
android:layout_marginStart="30dp"
|
android:layout_marginEnd="20dp"
|
||||||
android:id="@+id/status_reply"
|
android:id="@+id/status_privacy"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:layout_width="20dp"
|
android:layout_width="20dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:src="@drawable/ic_reply"/>
|
android:background="@color/light_grey"
|
||||||
<LinearLayout
|
/>
|
||||||
android:layout_width="0dp"
|
<ImageView
|
||||||
android:layout_weight="1"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_gravity="end"
|
android:layout_marginStart="20dp"
|
||||||
android:gravity="end"
|
android:id="@+id/status_more"
|
||||||
android:paddingRight="10dp"
|
android:layout_width="20dp"
|
||||||
android:paddingLeft="10dp"
|
android:layout_height="20dp"
|
||||||
android:layout_height="wrap_content">
|
android:src="@drawable/ic_action_more"/>
|
||||||
<ImageView
|
|
||||||
android:layout_marginRight="20dp"
|
|
||||||
android:layout_marginEnd="20dp"
|
|
||||||
android:id="@+id/status_privacy"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_width="20dp"
|
|
||||||
android:layout_height="20dp"
|
|
||||||
android:background="@color/light_grey"
|
|
||||||
/>
|
|
||||||
<ImageView
|
|
||||||
android:layout_marginLeft="20dp"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:id="@+id/status_more"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:src="@drawable/ic_action_more"/>
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
Loading…
Reference in New Issue