From d88b4323dc5641e917a9798225172a4fdcf89afc Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 26 Aug 2017 17:53:13 +0200 Subject: [PATCH 1/3] Separated classes for productFlavors --- app/build.gradle | 8 + .../activities/LoginActivity.java | 0 .../activities/MainActivity.java | 0 .../activities/LoginActivity.java | 373 ++++++ .../activities/MainActivity.java | 1127 +++++++++++++++++ 5 files changed, 1508 insertions(+) rename app/src/{main/java/fr/gouv/etalab/mastodon => free/fr.gouv.etalab.mastodon}/activities/LoginActivity.java (100%) rename app/src/{main/java/fr/gouv/etalab/mastodon => free/fr.gouv.etalab.mastodon}/activities/MainActivity.java (100%) create mode 100644 app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java create mode 100644 app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java diff --git a/app/build.gradle b/app/build.gradle index f8d54b090..bb1709aca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,13 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + productFlavors { + free { + } + proprietary { + } + } } allprojects { repositories { @@ -34,4 +41,5 @@ dependencies { compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.google.code.gson:gson:2.8.0' compile 'org.jsoup:jsoup:1.10.3' + proprietaryCompile 'com.google.android.gms:play-services-safetynet:11.0.4' } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/free/fr.gouv.etalab.mastodon/activities/LoginActivity.java similarity index 100% rename from app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java rename to app/src/free/fr.gouv.etalab.mastodon/activities/LoginActivity.java diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/free/fr.gouv.etalab.mastodon/activities/MainActivity.java similarity index 100% rename from app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java rename to app/src/free/fr.gouv.etalab.mastodon/activities/MainActivity.java diff --git a/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java b/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java new file mode 100644 index 000000000..616b33c6f --- /dev/null +++ b/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java @@ -0,0 +1,373 @@ +/* Copyright 2017 Thomas Schneider + * + * This file is a part of Mastalab + * + * 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. + * + * Mastalab 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 Mastalab; if not, + * see . */ +package fr.gouv.etalab.mastodon.activities; + +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.graphics.Paint; +import android.os.AsyncTask; +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; +import android.widget.ArrayAdapter; +import android.widget.AutoCompleteTextView; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; + +import com.google.android.gms.common.GooglePlayServicesUtil; +import com.google.android.gms.security.ProviderInstaller; +import com.loopj.android.http.AsyncHttpClient; +import com.loopj.android.http.AsyncHttpResponseHandler; +import com.loopj.android.http.RequestParams; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; + +import cz.msebera.android.httpclient.Header; +import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoAsyncTask; +import fr.gouv.etalab.mastodon.client.KinrarClient; +import fr.gouv.etalab.mastodon.client.MastalabSSLSocketFactory; +import fr.gouv.etalab.mastodon.client.OauthClient; +import fr.gouv.etalab.mastodon.helper.Helper; +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.changeDrawableColor; + + +/** + * Created by Thomas on 23/04/2017. + * Login activity class which handles the connection + */ + +public class LoginActivity extends AppCompatActivity implements ProviderInstaller.ProviderInstallListener { + + private String client_id; + private String client_secret; + private TextView login_two_step; + private static boolean client_id_for_webview = false; + private String instance; + private AutoCompleteTextView login_instance; + boolean isLoadingInstance = false; + private static final int ERROR_DIALOG_REQUEST_CODE = 97; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ProviderInstaller.installIfNeededAsync(this, this); + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_LIGHT){ + setTheme(R.style.AppTheme); + }else { + setTheme(R.style.AppThemeDark); + } + setContentView(R.layout.activity_login); + + if( theme == Helper.THEME_DARK) { + changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC2); + }else { + changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC3); + } + final Button connectionButton = (Button) findViewById(R.id.login_button); + login_instance = (AutoCompleteTextView) findViewById(R.id.login_instance); + + + login_instance.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + @Override + public void afterTextChanged(Editable s) { + if( s.length() > 2 && !isLoadingInstance){ + String action = "/instances/search"; + RequestParams parameters = new RequestParams(); + parameters.add("q", s.toString().trim()); + parameters.add("count", String.valueOf(5)); + parameters.add("name", String.valueOf(true)); + isLoadingInstance = true; + new KinrarClient().get(action, parameters, new AsyncHttpResponseHandler() { + @Override + public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) { + isLoadingInstance = false; + String response = new String(responseBody); + String[] instances; + try { + JSONObject jsonObject = new JSONObject(response); + JSONArray jsonArray = jsonObject.getJSONArray("instances"); + if( jsonArray != null){ + instances = new String[jsonArray.length()]; + for(int i = 0 ; i < jsonArray.length() ; i++){ + instances[i] = jsonArray.getJSONObject(i).get("name").toString(); + } + }else { + instances = new String[]{}; + } + login_instance.setAdapter(null); + ArrayAdapter adapter = + new ArrayAdapter<>(LoginActivity.this, android.R.layout.simple_list_item_1, instances); + login_instance.setAdapter(adapter); + if( login_instance.hasFocus() && !LoginActivity.this.isFinishing()) + login_instance.showDropDown(); + + } catch (JSONException ignored) {isLoadingInstance = false;} + } + @Override + public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) { + isLoadingInstance = false; + } + }); + } + } + }); + + + connectionButton.setEnabled(false); + login_two_step = (TextView) findViewById(R.id.login_two_step); + login_two_step.setVisibility(View.GONE); + login_two_step.setPaintFlags(login_two_step.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); + login_two_step.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + client_id_for_webview = true; + retrievesClientId(); + } + }); + + login_instance.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + connectionButton.setEnabled(false); + login_two_step.setVisibility(View.INVISIBLE); + if (!hasFocus) { + retrievesClientId(); + } + } + }); + } + + @Override + protected void onResume(){ + super.onResume(); + Button connectionButton = (Button) findViewById(R.id.login_button); + if (login_instance.getText() != null && login_instance.getText().toString().length() > 0 && client_id_for_webview) { + connectionButton.setEnabled(false); + client_id_for_webview = false; + retrievesClientId(); + } + } + + private void retrievesClientId(){ + final Button connectionButton = (Button) findViewById(R.id.login_button); + try { + instance = URLEncoder.encode(login_instance.getText().toString().trim(), "utf-8"); + } catch (UnsupportedEncodingException e) { + Toast.makeText(LoginActivity.this,R.string.client_error, Toast.LENGTH_LONG).show(); + } + String action = "/api/v1/apps"; + RequestParams parameters = new RequestParams(); + parameters.add(Helper.CLIENT_NAME, Helper.CLIENT_NAME_VALUE); + parameters.add(Helper.REDIRECT_URIS, client_id_for_webview?Helper.REDIRECT_CONTENT_WEB:Helper.REDIRECT_CONTENT); + parameters.add(Helper.SCOPES, Helper.OAUTH_SCOPES); + parameters.add(Helper.WEBSITE, Helper.WEBSITE_VALUE); + new OauthClient(instance).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); + client_id = resobj.get(Helper.CLIENT_ID).toString(); + client_secret = resobj.get(Helper.CLIENT_SECRET).toString(); + + String id = resobj.get(Helper.ID).toString(); + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putString(Helper.CLIENT_ID, client_id); + editor.putString(Helper.CLIENT_SECRET, client_secret); + editor.putString(Helper.ID, id); + editor.apply(); + connectionButton.setEnabled(true); + login_two_step.setVisibility(View.VISIBLE); + if( client_id_for_webview){ + Intent i = new Intent(LoginActivity.this, WebviewConnectActivity.class); + i.putExtra("instance", instance); + startActivity(i); + } + } catch (JSONException e) { + e.printStackTrace(); + } + + } + + @Override + public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) { + error.printStackTrace(); + Toast.makeText(LoginActivity.this,R.string.client_error, Toast.LENGTH_LONG).show(); + } + }); + + connectionButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + connectionButton.setEnabled(false); + if( client_id_for_webview ){ + client_id_for_webview = false; + retrievesClientId(); + return; + } + 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 { + MastalabSSLSocketFactory mastalabSSLSocketFactory = new MastalabSSLSocketFactory(MastalabSSLSocketFactory.getKeystore()); + mastalabSSLSocketFactory.setHostnameVerifier(MastalabSSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + client.setSSLSocketFactory(mastalabSSLSocketFactory); + client.post("https://" + 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, instance).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); + error.printStackTrace(); + Toast.makeText(getApplicationContext(),R.string.toast_error_login,Toast.LENGTH_LONG).show(); + } + }); + + } catch (NoSuchAlgorithmException | KeyManagementException | UnrecoverableKeyException | KeyStoreException e) { + e.printStackTrace(); + } + + } + }); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main_login, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_about) { + Intent intent = new Intent(getApplicationContext(), AboutActivity.class); + startActivity(intent); + }else if(id == R.id.action_privacy){ + Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class); + startActivity(intent); + } + return super.onOptionsItemSelected(item); + } + + + @Override + public void onProviderInstalled() { + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, + Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == ERROR_DIALOG_REQUEST_CODE) { + // Adding a fragment via GooglePlayServicesUtil.showErrorDialogFragment + // before the instance state is restored throws an error. So instead, + // set a flag here, which will cause the fragment to delay until + // onPostResume. + } + } + + + @Override + public void onProviderInstallFailed(int errorCode, Intent recoveryIntent) { + if (GooglePlayServicesUtil.isUserRecoverableError(errorCode)) { + // Recoverable error. Show a dialog prompting the user to + // install/update/enable Google Play services. + GooglePlayServicesUtil.showErrorDialogFragment( + errorCode, + this, + ERROR_DIALOG_REQUEST_CODE, + new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + // The user chose not to take the recovery action + onProviderInstallerNotAvailable(); + } + }); + } else { + // Google Play services is not available. + onProviderInstallerNotAvailable(); + } + } + private void onProviderInstallerNotAvailable() { + // This is reached if the provider cannot be updated for some reason. + // App should consider all HTTP communication to be vulnerable, and take + // appropriate action. + } + +} \ No newline at end of file diff --git a/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java new file mode 100644 index 000000000..c2ffe0b63 --- /dev/null +++ b/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -0,0 +1,1127 @@ +/* Copyright 2017 Thomas Schneider + * + * This file is a part of Mastalab + * + * 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. + * + * Mastalab 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 Mastalab; if not, + * see . */ +package fr.gouv.etalab.mastodon.activities; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.sqlite.SQLiteDatabase; +import android.graphics.PorterDuff; +import android.net.Uri; +import android.os.AsyncTask; +import android.os.Bundle; +import android.os.Handler; +import android.support.annotation.NonNull; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.TabLayout; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.SearchView; +import android.support.v7.widget.SwitchCompat; +import android.view.LayoutInflater; +import android.view.View; +import android.support.design.widget.NavigationView; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; +import android.view.inputmethod.InputMethodManager; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.Toast; + +import com.google.android.gms.common.GooglePlayServicesUtil; +import com.google.android.gms.security.ProviderInstaller; +import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache; +import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.ImageLoader; +import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; +import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer; + +import java.io.File; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Stack; +import java.util.concurrent.TimeUnit; + +import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoByIDAsyncTask; +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.DisplayFollowRequestSentFragment; +import fr.gouv.etalab.mastodon.fragments.DisplayNotificationsFragment; +import fr.gouv.etalab.mastodon.fragments.DisplayScheduledTootsFragment; +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.asynctasks.RetrieveAccountsAsyncTask; +import fr.gouv.etalab.mastodon.asynctasks.RetrieveFeedsAsyncTask; +import fr.gouv.etalab.mastodon.fragments.DisplayStatusFragment; +import fr.gouv.etalab.mastodon.fragments.TabLayoutSettingsFragment; +import fr.gouv.etalab.mastodon.sqlite.AccountDAO; +import mastodon.etalab.gouv.fr.mastodon.R; + +import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_THEME_INTENT; +import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_USER_INTENT; +import static fr.gouv.etalab.mastodon.helper.Helper.HOME_TIMELINE_INTENT; +import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION; +import static fr.gouv.etalab.mastodon.helper.Helper.NOTIFICATION_INTENT; +import static fr.gouv.etalab.mastodon.helper.Helper.PREF_KEY_ID; +import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; +import static fr.gouv.etalab.mastodon.helper.Helper.changeUser; +import static fr.gouv.etalab.mastodon.helper.Helper.loadPPInActionBar; +import static fr.gouv.etalab.mastodon.helper.Helper.menuAccounts; +import static fr.gouv.etalab.mastodon.helper.Helper.unCheckAllMenuItems; +import static fr.gouv.etalab.mastodon.helper.Helper.updateHeaderAccountInfo; +import android.support.v4.app.FragmentStatePagerAdapter; + + +public class MainActivity extends AppCompatActivity + implements NavigationView.OnNavigationItemSelectedListener, OnUpdateAccountInfoInterface, ProviderInstaller.ProviderInstallListener { + + private FloatingActionButton toot; + private HashMap tagTile = new HashMap<>(); + private HashMap tagItem = new HashMap<>(); + private TextView toolbarTitle; + private ImageView pp_actionBar; + private SearchView toolbar_search; + private ImageLoader imageLoader; + private DisplayImageOptions options; + private View headerLayout; + public static String currentLocale; + private TabLayout tabLayout; + private ViewPager viewPager; + private RelativeLayout main_app_container; + private Stack stackBack = new Stack<>(); + + private DisplayStatusFragment homeFragment; + private DisplayNotificationsFragment notificationsFragment; + private static final int ERROR_DIALOG_REQUEST_CODE = 97; + + public MainActivity() { + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ProviderInstaller.installIfNeededAsync(this, this); + final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + + final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_LIGHT){ + setTheme(R.style.AppTheme_NoActionBar); + }else { + setTheme(R.style.AppThemeDark_NoActionBar); + } + setContentView(R.layout.activity_main); + + //Test if user is still log in + if( ! Helper.isLoggedIn(getApplicationContext())) { + //It is not, the user is redirected to the login page + Intent myIntent = new Intent(MainActivity.this, LoginActivity.class); + startActivity(myIntent); + finish(); + return; + } + + Helper.fillMapEmoji(getApplicationContext()); + //Here, the user is authenticated + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + toolbarTitle = (TextView) toolbar.findViewById(R.id.toolbar_title); + pp_actionBar = (ImageView) toolbar.findViewById(R.id.pp_actionBar); + toolbar_search = (SearchView) toolbar.findViewById(R.id.toolbar_search); + tabLayout = (TabLayout) findViewById(R.id.tabLayout); + TabLayout.Tab tabHome = tabLayout.newTab(); + TabLayout.Tab tabNotif = tabLayout.newTab(); + TabLayout.Tab tabLocal = tabLayout.newTab(); + TabLayout.Tab tabPublic = tabLayout.newTab(); + tabHome.setCustomView(R.layout.tab_badge); + tabNotif.setCustomView(R.layout.tab_badge); + tabLocal.setCustomView(R.layout.tab_badge); + tabPublic.setCustomView(R.layout.tab_badge); + + @SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId") + ImageView iconHome = (ImageView) tabHome.getCustomView().findViewById(R.id.tab_icon); + iconHome.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN); + iconHome.setImageResource(R.drawable.ic_action_home_tl); + + @SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId") + ImageView iconNotif = (ImageView) tabNotif.getCustomView().findViewById(R.id.tab_icon); + iconNotif.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN); + iconNotif.setImageResource(R.drawable.ic_notifications_tl); + + + @SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId") + ImageView iconLocal = (ImageView) tabLocal.getCustomView().findViewById(R.id.tab_icon); + iconLocal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN); + iconLocal.setImageResource(R.drawable.ic_action_users_tl); + + @SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId") + ImageView iconGlobal = (ImageView) tabPublic.getCustomView().findViewById(R.id.tab_icon); + iconGlobal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN); + iconGlobal.setImageResource(R.drawable.ic_action_globe_tl); + + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_home_tl,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications_tl,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_users_tl,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe_tl,R.color.dark_text); + + tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); + tabLayout.setTabMode(TabLayout.MODE_FIXED); + + tabLayout.addTab(tabHome); + tabLayout.addTab(tabNotif); + tabLayout.addTab(tabLocal); + tabLayout.addTab(tabPublic); + + viewPager = (ViewPager) findViewById(R.id.viewpager); + main_app_container = (RelativeLayout) findViewById(R.id.main_app_container); + PagerAdapter adapter = new PagerAdapter + (getSupportFragmentManager(), tabLayout.getTabCount()); + viewPager.setAdapter(adapter); + viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); + final boolean bubbles = sharedpreferences.getBoolean(Helper.SET_BUBBLE_COUNTER, true); + tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + @Override + public void onTabSelected(TabLayout.Tab tab) { + viewPager.setCurrentItem(tab.getPosition()); + if (stackBack.empty()) + stackBack.push(0); + if (stackBack.contains(tab.getPosition())) { + stackBack.remove(stackBack.indexOf(tab.getPosition())); + stackBack.push(tab.getPosition()); + } else { + stackBack.push(tab.getPosition()); + } + final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + MenuItem item = null; + String fragmentTag = null; + main_app_container.setVisibility(View.GONE); + viewPager.setVisibility(View.VISIBLE); + Helper.switchLayout(MainActivity.this); + switch (tab.getPosition()){ + case 0: + item = navigationView.getMenu().findItem(R.id.nav_home); + fragmentTag = "HOME_TIMELINE"; + if( bubbles && homeFragment != null) + homeFragment.refreshData(); + updateHomeCounter(0); + break; + case 1: + fragmentTag = "NOTIFICATIONS"; + item = navigationView.getMenu().findItem(R.id.nav_notification); + updateNotifCounter(0); + if( bubbles && notificationsFragment != null) + notificationsFragment.refreshData(); + break; + case 2: + fragmentTag = "LOCAL_TIMELINE"; + item = navigationView.getMenu().findItem(R.id.nav_local); + break; + case 3: + item = navigationView.getMenu().findItem(R.id.nav_global); + fragmentTag = "PUBLIC_TIMELINE"; + break; + } + if( item != null){ + toolbarTitle.setText(item.getTitle()); + populateTitleWithTag(fragmentTag, item.getTitle().toString(), item.getItemId()); + unCheckAllMenuItems(navigationView); + item.setChecked(true); + } + if( tab.getPosition() != 1 ) + toot.setVisibility(View.VISIBLE); + else + toot.setVisibility(View.GONE); + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + } + + @Override + public void onTabUnselected(TabLayout.Tab tab) { + + } + + @Override + public void onTabReselected(TabLayout.Tab tab) { + if( viewPager.getVisibility() == View.GONE){ + viewPager.setVisibility(View.VISIBLE); + Helper.switchLayout(MainActivity.this); + main_app_container.setVisibility(View.GONE); + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + } + if( tab.getPosition() != 1 ) + toot.setVisibility(View.VISIBLE); + else + toot.setVisibility(View.GONE); + Fragment fragment = (Fragment) viewPager.getAdapter().instantiateItem(viewPager, tab.getPosition()); + switch (tab.getPosition()){ + case 0: + case 2: + case 3: + DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment); + if( displayStatusFragment != null ) + displayStatusFragment.scrollToTop(); + break; + case 1: + DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment); + if( displayNotificationsFragment != null ) + displayNotificationsFragment.scrollToTop(); + break; + } + } + }); + + final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + navigationView.setNavigationItemSelectedListener(this); + + + //Scroll to top when top bar is clicked for favourites/blocked/muted + toolbarTitle.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + FragmentManager fragmentManager = getSupportFragmentManager(); + + if( navigationView.getMenu().findItem(R.id.nav_favorites).isChecked()){ + DisplayStatusFragment faveFrag = (DisplayStatusFragment) fragmentManager.findFragmentByTag("FAVOURITES"); + if (faveFrag != null && faveFrag.isVisible()) { + faveFrag.scrollToTop(); + } + } else if (navigationView.getMenu().findItem(R.id.nav_blocked).isChecked()) { + DisplayAccountsFragment blockFrag = (DisplayAccountsFragment) fragmentManager.findFragmentByTag("BLOCKS"); + + if (blockFrag != null && blockFrag.isVisible()) { + blockFrag.scrollToTop(); + } + } else if (navigationView.getMenu().findItem(R.id.nav_muted).isChecked()) { + DisplayAccountsFragment muteFrag = (DisplayAccountsFragment) fragmentManager.findFragmentByTag("MUTED"); + + if (muteFrag != null && muteFrag.isVisible()) { + muteFrag.scrollToTop(); + } + //Scroll to top when top bar is clicked (THEME_MENU only) + } else if (Helper.THEME_MENU == sharedpreferences.getInt(Helper.SET_TABS, Helper.THEME_TABS)) { + int pos = tabLayout.getSelectedTabPosition(); + Fragment fragment = (Fragment) viewPager.getAdapter().instantiateItem(viewPager, pos); + switch (pos) { + case 0: + case 2: + case 3: + DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment); + if (displayStatusFragment != null) + displayStatusFragment.scrollToTop(); + break; + case 1: + DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment); + if (displayNotificationsFragment != null) + displayNotificationsFragment.scrollToTop(); + break; + } + } + } + }); + + + toolbar_search.setOnQueryTextListener(new SearchView.OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String query) { + //Hide keyboard + InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(toolbar_search.getWindowToken(), 0); + Intent intent = new Intent(MainActivity.this, SearchResultActivity.class); + intent.putExtra("search", query); + startActivity(intent); + return true; + } + @Override + public boolean onQueryTextChange(String newText) { + return false; + } + }); + //Hide/Close the searchview + + + toolbar_search.setOnCloseListener(new SearchView.OnCloseListener() { + @Override + public boolean onClose() { + toolbarTitle.setVisibility(View.VISIBLE); + pp_actionBar.setVisibility(View.VISIBLE); + //your code here + return false; + } + }); + toolbar_search.setOnSearchClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if( toolbar_search.isIconified()){ + toolbarTitle.setVisibility(View.VISIBLE); + pp_actionBar.setVisibility(View.VISIBLE); + }else { + toolbarTitle.setVisibility(View.GONE); + pp_actionBar.setVisibility(View.GONE); + } + } + }); + + //Hide the default title + if( getSupportActionBar() != null) + getSupportActionBar().setDisplayShowTitleEnabled(false); + //Defines the current locale of the device in a static variable + currentLocale = Helper.currentLocale(getApplicationContext()); + + toot = (FloatingActionButton) findViewById(R.id.toot); + toot.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(getApplicationContext(), TootActivity.class); + startActivity(intent); + } + }); + + final DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( + this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.addDrawerListener(toggle); + toggle.syncState(); + + + + + //Image loader configuration + imageLoader = ImageLoader.getInstance(); + File cacheDir = new File(getCacheDir(), getString(R.string.app_name)); + ImageLoaderConfiguration configImg = new ImageLoaderConfiguration.Builder(this) + .imageDownloader(new PatchBaseImageDownloader(getApplicationContext())) + .threadPoolSize(5) + .threadPriority(Thread.MIN_PRIORITY + 3) + .denyCacheImageMultipleSizesInMemory() + .diskCache(new UnlimitedDiskCache(cacheDir)) + .build(); + imageLoader.init(configImg); + SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(90)).cacheInMemory(false) + .cacheOnDisk(true).resetViewBeforeLoading(true).build(); + + + headerLayout = navigationView.getHeaderView(0); + + String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null); + Account account = new AccountDAO(getApplicationContext(), db).getAccountByToken(prefKeyOauthTokenT); + updateHeaderAccountInfo(MainActivity.this, account, headerLayout, imageLoader, options); + loadPPInActionBar(MainActivity.this, account.getAvatar()); + //Locked account can see follow request + if (account.isLocked()) { + navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true); + } else { + navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false); + } + + LinearLayout owner_container = (LinearLayout) headerLayout.findViewById(R.id.owner_container); + owner_container.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + menuAccounts(MainActivity.this); + } + }); + boolean matchingIntent = mamageNewIntent(getIntent()); + if (savedInstanceState == null && !matchingIntent) { + navigationView.setCheckedItem(R.id.nav_home); + navigationView.getMenu().performIdentifierAction(R.id.nav_home, 0); + toolbarTitle.setText(R.string.home_menu); + } + + boolean popupShown = sharedpreferences.getBoolean(Helper.SET_POPUP_PUSH, false); + if(!popupShown){ + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this); + LayoutInflater inflater = getLayoutInflater(); + @SuppressLint("InflateParams") View dialogView = inflater.inflate(R.layout.popup_quick_settings, null); + dialogBuilder.setView(dialogView); + + final SwitchCompat set_push_hometimeline = (SwitchCompat) dialogView.findViewById(R.id.set_push_hometimeline); + final SwitchCompat set_push_notification = (SwitchCompat) dialogView.findViewById(R.id.set_push_notification); + boolean notif_hometimeline = sharedpreferences.getBoolean(Helper.SET_NOTIF_HOMETIMELINE, true); + boolean notif_follow = sharedpreferences.getBoolean(Helper.SET_NOTIF_FOLLOW, true); + boolean notif_add = sharedpreferences.getBoolean(Helper.SET_NOTIF_ADD, true); + boolean notif_ask = sharedpreferences.getBoolean(Helper.SET_NOTIF_ASK, true); + boolean notif_mention = sharedpreferences.getBoolean(Helper.SET_NOTIF_MENTION, true); + boolean notif_share = sharedpreferences.getBoolean(Helper.SET_NOTIF_SHARE, true); + boolean notifif_notifications = !( !notif_follow && !notif_add && !notif_ask && !notif_mention && !notif_share); + set_push_hometimeline.setChecked(notif_hometimeline); + set_push_notification.setChecked(notifif_notifications); + + dialogBuilder.setTitle(R.string.settings_popup_title); + dialogBuilder.setCancelable(false); + dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_NOTIF_FOLLOW, set_push_notification.isChecked()); + editor.putBoolean(Helper.SET_NOTIF_ADD, set_push_notification.isChecked()); + editor.putBoolean(Helper.SET_NOTIF_ASK, set_push_notification.isChecked()); + editor.putBoolean(Helper.SET_NOTIF_MENTION, set_push_notification.isChecked()); + editor.putBoolean(Helper.SET_NOTIF_SHARE, set_push_notification.isChecked()); + editor.putBoolean(Helper.SET_NOTIF_HOMETIMELINE, set_push_hometimeline.isChecked()); + editor.putBoolean(Helper.SET_POPUP_PUSH, true); + editor.apply(); + } + }).show(); + } + Helper.switchLayout(MainActivity.this); + + + } + + + + + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + mamageNewIntent(intent); + } + + /** + * Manages new intents + * @param intent Intent - intent related to a notification in top bar + */ + private boolean mamageNewIntent(Intent intent){ + if( intent == null || intent.getExtras() == null ) + return false; + + String action = intent.getAction(); + String type = intent.getType(); + Bundle extras = intent.getExtras(); + String userIdIntent; + boolean matchingIntent = false; + if( extras.containsKey(INTENT_ACTION) ){ + final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + userIdIntent = extras.getString(PREF_KEY_ID); //Id of the account in the intent + if (extras.getInt(INTENT_ACTION) == NOTIFICATION_INTENT){ + changeUser(MainActivity.this, userIdIntent, false); //Connects the account which is related to the notification + unCheckAllMenuItems(navigationView); + if( tabLayout.getTabAt(1) != null) + //noinspection ConstantConditions + tabLayout.getTabAt(1).select(); + matchingIntent = true; + }else if( extras.getInt(INTENT_ACTION) == HOME_TIMELINE_INTENT){ + changeUser(MainActivity.this, userIdIntent, true); //Connects the account which is related to the notification + }else if( extras.getInt(INTENT_ACTION) == CHANGE_THEME_INTENT){ + unCheckAllMenuItems(navigationView); + navigationView.setCheckedItem(R.id.nav_settings); + navigationView.getMenu().performIdentifierAction(R.id.nav_settings, 0); + toolbarTitle.setText(R.string.settings); + matchingIntent = true; + }else if( extras.getInt(INTENT_ACTION) == CHANGE_USER_INTENT){ + unCheckAllMenuItems(navigationView); + navigationView.setCheckedItem(R.id.nav_home); + navigationView.getMenu().performIdentifierAction(R.id.nav_home, 0); + toolbarTitle.setText(R.string.home_menu); + matchingIntent = true; + } + }else if( Intent.ACTION_SEND.equals(action) && type != null ) { + if ("text/plain".equals(type)) { + String sharedSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT); + String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + if (sharedText != null) { + Intent intentToot = new Intent(getApplicationContext(), TootActivity.class); + Bundle b = new Bundle(); + b.putString("sharedSubject", sharedSubject); + b.putString("sharedContent", sharedText); + intentToot.putExtras(b); + startActivity(intentToot); + } + + } else if (type.startsWith("image/")) { + + Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); + + if (imageUri != null) { + + Intent intentToot = new Intent(getApplicationContext(), TootActivity.class); + Bundle b = new Bundle(); + + b.putParcelable("sharedUri", imageUri); + b.putInt("uriNumber", 1); + intentToot.putExtras(b); + startActivity(intentToot); + } + } + } else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null ) { + if (type.startsWith("image/")) { + + ArrayList imageList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); + if (imageList != null) { + Intent intentToot = new Intent(getApplicationContext(), TootActivity.class); + Bundle b = new Bundle(); + + b.putParcelableArrayList("sharedUri", imageList); + b.putInt("uriNumber", imageList.size()); + intentToot.putExtras(b); + startActivity(intentToot); + } + } + } + intent.replaceExtras(new Bundle()); + intent.setAction(""); + intent.setData(null); + intent.setFlags(0); + return matchingIntent; + } + + @Override + public void onBackPressed() { + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + if (drawer.isDrawerOpen(GravityCompat.START)) { + drawer.closeDrawer(GravityCompat.START); + } else { + //Hide search bar on back pressed + if( !toolbar_search.isIconified()){ + toolbar_search.setIconified(true); + } + if( viewPager.getVisibility() == View.VISIBLE){ + if (stackBack.size() > 1) { + stackBack.pop(); + viewPager.setCurrentItem(stackBack.lastElement()); + }else { + super.onBackPressed(); + } + }else { + viewPager.setVisibility(View.VISIBLE); + Helper.switchLayout(MainActivity.this); + main_app_container.setVisibility(View.GONE); + final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + unCheckAllMenuItems(navigationView); + //Manages theme for icon colors + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_local_post_office,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet_black,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_fav_black,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text); + }else { + changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_local_post_office,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet_black,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_fav_black,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.white); + changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.white); + changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.white); + } + switch (viewPager.getCurrentItem()){ + case 0: + toolbarTitle.setText(R.string.home_menu); + navigationView.getMenu().findItem(R.id.nav_home).setChecked(true); + break; + case 1: + toot.setVisibility(View.GONE); + toolbarTitle.setText(R.string.notifications); + navigationView.getMenu().findItem(R.id.nav_notification).setChecked(true); + break; + case 2: + toolbarTitle.setText(R.string.local_menu); + navigationView.getMenu().findItem(R.id.nav_local).setChecked(true); + break; + case 3: + toolbarTitle.setText(R.string.global_menu); + navigationView.getMenu().findItem(R.id.nav_global).setChecked(true); + break; + } + } + + } + + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if(id == R.id.action_logout) { + Helper.logout(getApplicationContext()); + Intent myIntent = new Intent(MainActivity.this, LoginActivity.class); + startActivity(myIntent); + finish(); + return true; + }else if(id == R.id.action_about){ + Intent intent = new Intent(getApplicationContext(), AboutActivity.class); + startActivity(intent); + }else if(id == R.id.action_privacy){ + Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class); + startActivity(intent); + }else if(id == R.id.action_about_instance){ + Intent intent = new Intent(getApplicationContext(), InstanceActivity.class); + startActivity(intent); + } else if( id == R.id.action_cache){ //Cache clear feature + AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); + builder.setTitle(R.string.cache_title); + long sizeCache = Helper.cacheSize(getCacheDir()); + float cacheSize = 0; + if( sizeCache > 0 ) { + if (sizeCache > 0) { + cacheSize = (float) sizeCache / 1000000.0f; + } + } + final float finalCacheSize = cacheSize; + builder.setMessage(getString(R.string.cache_message, String.format("%s %s", String.format(Locale.getDefault(), "%.2f", cacheSize), getString(R.string.cache_units)))) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + // continue with delete + try { + String path = getCacheDir().getPath(); + File dir = new File(path); + if (dir.isDirectory()) { + Helper.deleteDir(dir); + } + } catch (Exception ignored) {} + Toast.makeText(MainActivity.this, getString(R.string.toast_cache_clear,String.format("%s %s", String.format(Locale.getDefault(), "%.2f", finalCacheSize), getString(R.string.cache_units))), Toast.LENGTH_LONG).show(); + dialog.dismiss(); + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }) + .setIcon(android.R.drawable.ic_dialog_alert) + .show(); + }else if( id == R.id.action_size){ + final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + int textSize = sharedpreferences.getInt(Helper.SET_TEXT_SIZE,110); + int iconSize = sharedpreferences.getInt(Helper.SET_ICON_SIZE,130); + + AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); + builder.setTitle(R.string.text_size); + + @SuppressLint("InflateParams") View popup_quick_settings = getLayoutInflater().inflate( R.layout.popup_text_size, null ); + builder.setView(popup_quick_settings); + + SeekBar set_text_size = (SeekBar) popup_quick_settings.findViewById(R.id.set_text_size); + SeekBar set_icon_size = (SeekBar) popup_quick_settings.findViewById(R.id.set_icon_size); + final TextView set_text_size_value = (TextView) popup_quick_settings.findViewById(R.id.set_text_size_value); + final TextView set_icon_size_value = (TextView) popup_quick_settings.findViewById(R.id.set_icon_size_value); + set_text_size_value.setText(String.format("%s%%",String.valueOf(textSize))); + set_icon_size_value.setText(String.format("%s%%",String.valueOf(iconSize))); + + set_text_size.setMax(20); + set_icon_size.setMax(20); + + set_text_size.setProgress(((textSize-80)/5)); + set_icon_size.setProgress(((iconSize-80)/5)); + + set_text_size.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onStopTrackingTouch(SeekBar seekBar) {} + @Override + public void onStartTrackingTouch(SeekBar seekBar) {} + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + + int value = 80 + progress*5; + set_text_size_value.setText(String.format("%s%%",String.valueOf(value))); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putInt(Helper.SET_TEXT_SIZE, value); + editor.apply(); + } + }); + set_icon_size.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onStopTrackingTouch(SeekBar seekBar) {} + @Override + public void onStartTrackingTouch(SeekBar seekBar) {} + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + int value = 80 + progress*5; + set_icon_size_value.setText(String.format("%s%%",String.valueOf(value))); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putInt(Helper.SET_ICON_SIZE, value); + editor.apply(); + } + }); + builder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + MainActivity.this.recreate(); + dialog.dismiss(); + } + }) + .setIcon(android.R.drawable.ic_dialog_alert) + .show(); + } + + return super.onOptionsItemSelected(item); + } + + @Override + public void onResume(){ + super.onResume(); + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + boolean bubbles = sharedpreferences.getBoolean(Helper.SET_BUBBLE_COUNTER, true); + if( bubbles){ + Handler handler = new Handler(); + handler.postDelayed(new Runnable() { + @Override + public void run() {refreshData();} + }, 1000); + } + //Proceeds to update of the authenticated account + if(Helper.isLoggedIn(getApplicationContext())) + new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), MainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } + + + + + @SuppressWarnings("StatementWithEmptyBody") + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + // Handle navigation view item clicks here. + int id = item.getItemId(); + if( id == R.id.nav_remote_follow){ + Intent remoteFollow = new Intent(getApplicationContext(), RemoteFollowActivity.class); + startActivity(remoteFollow); + return false; + } + final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + unCheckAllMenuItems(navigationView); + item.setChecked(true); + //Remove the search bar + if( !toolbar_search.isIconified() ) { + toolbarTitle.setVisibility(View.VISIBLE); + pp_actionBar.setVisibility(View.VISIBLE); + toolbar_search.setIconified(true); + } + toolbarTitle.setText(item.getTitle()); + if (id == R.id.nav_home) { + //noinspection ConstantConditions + tabLayout.getTabAt(0).select(); + return true; + } else if( id == R.id.nav_notification){ + //noinspection ConstantConditions + tabLayout.getTabAt(1).select(); + return true; + }else if (id == R.id.nav_local) { + //noinspection ConstantConditions + tabLayout.getTabAt(2).select(); + return true; + } else if (id == R.id.nav_global) { + //noinspection ConstantConditions + tabLayout.getTabAt(3).select(); + return true; + } + DisplayStatusFragment statusFragment; + DisplayAccountsFragment accountsFragment; + Bundle bundle = new Bundle(); + FragmentManager fragmentManager = getSupportFragmentManager(); + String fragmentTag = null; + + main_app_container.setVisibility(View.VISIBLE); + viewPager.setVisibility(View.GONE); + tabLayout.setVisibility(View.GONE); + if (id == R.id.nav_settings) { + toot.setVisibility(View.GONE); + TabLayoutSettingsFragment tabLayoutSettingsFragment= new TabLayoutSettingsFragment(); + fragmentTag = "TABLAYOUT_SETTINGS"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, tabLayoutSettingsFragment, fragmentTag).commit(); + + } else if (id == R.id.nav_favorites) { + toot.setVisibility(View.GONE); + statusFragment = new DisplayStatusFragment(); + bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES); + statusFragment.setArguments(bundle); + fragmentTag = "FAVOURITES"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, statusFragment, fragmentTag).commit(); + } else if (id == R.id.nav_blocked) { + toot.setVisibility(View.GONE); + accountsFragment = new DisplayAccountsFragment(); + bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.BLOCKED); + accountsFragment.setArguments(bundle); + fragmentTag = "BLOCKS"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, accountsFragment, fragmentTag).commit(); + }else if (id == R.id.nav_muted) { + toot.setVisibility(View.GONE); + accountsFragment = new DisplayAccountsFragment(); + bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.MUTED); + accountsFragment.setArguments(bundle); + fragmentTag = "MUTED"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, accountsFragment, fragmentTag).commit(); + }else if (id == R.id.nav_scheduled) { + toot.setVisibility(View.VISIBLE); + DisplayScheduledTootsFragment displayScheduledTootsFragment = new DisplayScheduledTootsFragment(); + fragmentTag = "SCHEDULED"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, displayScheduledTootsFragment, fragmentTag).commit(); + }else if( id == R.id.nav_follow_request){ + toot.setVisibility(View.GONE); + DisplayFollowRequestSentFragment followRequestSentFragment = new DisplayFollowRequestSentFragment(); + fragmentTag = "FOLLOW_REQUEST_SENT"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, followRequestSentFragment, fragmentTag).commit(); + } + + populateTitleWithTag(fragmentTag, item.getTitle().toString(), item.getItemId()); + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + return true; + } + + + private void populateTitleWithTag(String tag, String title, int index){ + if( tag == null) + return; + if ( tagTile.get(tag) == null) + tagTile.put(tag, title); + if ( tagItem.get(tag) == null) + tagItem.put(tag, index); + } + + @Override + public void setTitle(CharSequence title) { + if(toolbarTitle != null ) + toolbarTitle.setText(title); + } + + @Override + public void onUpdateAccountInfo(boolean error) { + if( error){ + //An error occurred, the user is redirected to the login page + Helper.logout(getApplicationContext()); + Intent myIntent = new Intent(MainActivity.this, LoginActivity.class); + startActivity(myIntent); + finish(); + }else { + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); + SQLiteDatabase db = Sqlite.getInstance(MainActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + Account account = new AccountDAO(getApplicationContext(), db).getAccountByID(userId); + updateHeaderAccountInfo(MainActivity.this, account, headerLayout, imageLoader, options); + } + } + + + + @Override + public void onProviderInstalled() { + + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, + Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == ERROR_DIALOG_REQUEST_CODE) { + // Adding a fragment via GooglePlayServicesUtil.showErrorDialogFragment + // before the instance state is restored throws an error. So instead, + // set a flag here, which will cause the fragment to delay until + // onPostResume. + } + } + + + @Override + public void onProviderInstallFailed(int errorCode, Intent recoveryIntent) { + if (GooglePlayServicesUtil.isUserRecoverableError(errorCode)) { + // Recoverable error. Show a dialog prompting the user to + // install/update/enable Google Play services. + GooglePlayServicesUtil.showErrorDialogFragment( + errorCode, + this, + ERROR_DIALOG_REQUEST_CODE, + new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + // The user chose not to take the recovery action + onProviderInstallerNotAvailable(); + } + }); + } else { + // Google Play services is not available. + onProviderInstallerNotAvailable(); + } + } + private void onProviderInstallerNotAvailable() { + // This is reached if the provider cannot be updated for some reason. + // App should consider all HTTP communication to be vulnerable, and take + // appropriate action. + } + + + + /** + * Page Adapter for settings + */ + private class PagerAdapter extends FragmentStatePagerAdapter { + int mNumOfTabs; + + private PagerAdapter(FragmentManager fm, int NumOfTabs) { + super(fm); + this.mNumOfTabs = NumOfTabs; + } + + @Override + public Fragment getItem(int position) { + //Remove the search bar + if( !toolbar_search.isIconified() ) { + toolbarTitle.setVisibility(View.VISIBLE); + pp_actionBar.setVisibility(View.VISIBLE); + toolbar_search.setIconified(true); + } + //Selection comes from another menu, no action to do + DisplayStatusFragment statusFragment; + Bundle bundle = new Bundle(); + toot.setVisibility(View.VISIBLE); + switch (position) { + case 0: + homeFragment = new DisplayStatusFragment(); + bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.HOME); + homeFragment.setArguments(bundle); + return homeFragment; + case 1: + notificationsFragment = new DisplayNotificationsFragment(); + return notificationsFragment; + case 2: + statusFragment = new DisplayStatusFragment(); + bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.LOCAL); + statusFragment.setArguments(bundle); + return statusFragment; + case 3: + statusFragment = new DisplayStatusFragment(); + bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.PUBLIC); + statusFragment.setArguments(bundle); + return statusFragment; + + } + return null; + } + + @Override + public int getCount() { + return mNumOfTabs; + } + } + + private void refreshData(){ + final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + + String prefKeyOauthTokenT = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null); + SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + Account account = new AccountDAO(getApplicationContext(), db).getAccountByToken(prefKeyOauthTokenT); + if( account != null){ + String last_refresh = sharedpreferences.getString(Helper.LAST_BUBBLE_REFRESH_NOTIF + account.getId(), null); + Date last_refresh_date = Helper.stringToDate(getApplicationContext(), last_refresh); + if (last_refresh_date == null || (new Date().getTime() - last_refresh_date.getTime()) >= TimeUnit.SECONDS.toMillis(60)) { + + if( notificationsFragment != null ){ + notificationsFragment.update(); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putString(Helper.LAST_BUBBLE_REFRESH_NOTIF+ account.getId(),Helper.dateToString(getApplicationContext(), new Date())); + editor.apply(); + } + } + + last_refresh = sharedpreferences.getString(Helper.LAST_BUBBLE_REFRESH_HOME + account.getId(), null); + last_refresh_date = Helper.stringToDate(getApplicationContext(), last_refresh); + + if (last_refresh_date == null || (new Date().getTime() - last_refresh_date.getTime()) >= TimeUnit.SECONDS.toMillis(60)) { + if( homeFragment != null ){ + homeFragment.update(); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putString(Helper.LAST_BUBBLE_REFRESH_HOME+ account.getId(),Helper.dateToString(getApplicationContext(), new Date())); + editor.apply(); + } + } + } + } + + public void updateHomeCounter(int newHomeCount){ + if( tabLayout.getTabAt(0) == null ) + return; + //noinspection ConstantConditions + View tabHome = tabLayout.getTabAt(0).getCustomView(); + if( tabHome == null) + return; + TextView tabCounterHome = (TextView) tabHome.findViewById(R.id.tab_counter); + tabCounterHome.setText(String.valueOf(newHomeCount)); + if( newHomeCount > 0){ + //New data are available + //The fragment is not displayed, so the counter is displayed + if( tabLayout.getSelectedTabPosition() != 0) + tabCounterHome.setVisibility(View.VISIBLE); + else + tabCounterHome.setVisibility(View.GONE); + }else { + tabCounterHome.setVisibility(View.GONE); + } + } + + public void updateNotifCounter(int newNotifCount){ + if(tabLayout.getTabAt(1) == null) + return; + //noinspection ConstantConditions + View tabNotif = tabLayout.getTabAt(1).getCustomView(); + if( tabNotif == null) + return; + TextView tabCounterNotif = (TextView) tabNotif.findViewById(R.id.tab_counter); + tabCounterNotif.setText(String.valueOf(newNotifCount)); + if( newNotifCount > 0){ + if( tabLayout.getSelectedTabPosition() != 1) + tabCounterNotif.setVisibility(View.VISIBLE); + else + tabCounterNotif.setVisibility(View.GONE); + }else { + tabCounterNotif.setVisibility(View.GONE); + } + } + +} From 59d2f0498256fe155a193c170e34dcec9abb784e Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 26 Aug 2017 18:07:09 +0200 Subject: [PATCH 2/3] adds different version name for checks --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index bb1709aca..33880e0c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,7 @@ android { free { } proprietary { + versionName "1.4.7-s" } } } From 01a07a32217e729060d37a35fb5b2b6eee756ea4 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 26 Aug 2017 18:24:46 +0200 Subject: [PATCH 3/3] Fixes a bug with toot button --- .../free/fr.gouv.etalab.mastodon/activities/MainActivity.java | 2 +- .../java/fr.gouv.etalab.mastodon/activities/MainActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/free/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/free/fr.gouv.etalab.mastodon/activities/MainActivity.java index 74060ba15..fb0c6943d 100644 --- a/app/src/free/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/free/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -613,6 +613,7 @@ public class MainActivity extends AppCompatActivity main_app_container.setVisibility(View.GONE); final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); unCheckAllMenuItems(navigationView); + toot.setVisibility(View.VISIBLE); //Manages theme for icon colors SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); @@ -972,7 +973,6 @@ public class MainActivity extends AppCompatActivity //Selection comes from another menu, no action to do DisplayStatusFragment statusFragment; Bundle bundle = new Bundle(); - toot.setVisibility(View.VISIBLE); switch (position) { case 0: homeFragment = new DisplayStatusFragment(); diff --git a/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java index c2ffe0b63..6e493ff4c 100644 --- a/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -616,6 +616,7 @@ public class MainActivity extends AppCompatActivity main_app_container.setVisibility(View.GONE); final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); unCheckAllMenuItems(navigationView); + toot.setVisibility(View.VISIBLE); //Manages theme for icon colors SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); @@ -1020,7 +1021,6 @@ public class MainActivity extends AppCompatActivity //Selection comes from another menu, no action to do DisplayStatusFragment statusFragment; Bundle bundle = new Bundle(); - toot.setVisibility(View.VISIBLE); switch (position) { case 0: homeFragment = new DisplayStatusFragment();