Fixes when temp toots are added + applies changes to safetynet release
This commit is contained in:
parent
cc060f913c
commit
8d1b4a79de
|
@ -68,6 +68,7 @@ import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
|
@ -75,8 +76,6 @@ import java.util.regex.Matcher;
|
||||||
import fr.gouv.etalab.mastodon.asynctasks.RetrieveMetaDataAsyncTask;
|
import fr.gouv.etalab.mastodon.asynctasks.RetrieveMetaDataAsyncTask;
|
||||||
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.Entities.Notification;
|
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
|
||||||
import fr.gouv.etalab.mastodon.client.PatchBaseImageDownloader;
|
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.DisplayFollowRequestSentFragment;
|
import fr.gouv.etalab.mastodon.fragments.DisplayFollowRequestSentFragment;
|
||||||
|
@ -140,6 +139,8 @@ public class MainActivity extends AppCompatActivity
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
|
||||||
|
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
|
||||||
receive_data = new BroadcastReceiver() {
|
receive_data = new BroadcastReceiver() {
|
||||||
@Override
|
@Override
|
||||||
public void onReceive(Context context, Intent intent) {
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
@ -179,7 +180,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
|
|
||||||
|
|
||||||
ProviderInstaller.installIfNeededAsync(this, this);
|
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);
|
final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
|
||||||
if( theme == Helper.THEME_LIGHT){
|
if( theme == Helper.THEME_LIGHT){
|
||||||
|
@ -200,8 +200,16 @@ public class MainActivity extends AppCompatActivity
|
||||||
finish();
|
finish();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
|
||||||
startService(new Intent(getApplicationContext(), StreamingService.class));
|
List<Account> accounts = new AccountDAO(getApplicationContext(), db).getAllAccount();
|
||||||
|
if( accounts != null){
|
||||||
|
for (Account account: accounts) {
|
||||||
|
Intent intent = new Intent(getApplicationContext(), StreamingService.class);
|
||||||
|
intent.putExtra("accountId", account.getId());
|
||||||
|
intent.putExtra("accountAcct", account.getAcct());
|
||||||
|
startService(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
Helper.fillMapEmoji(getApplicationContext());
|
Helper.fillMapEmoji(getApplicationContext());
|
||||||
//Here, the user is authenticated
|
//Here, the user is authenticated
|
||||||
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
||||||
|
@ -285,7 +293,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
if (homeFragment != null && Helper.getUnreadToots(getApplicationContext(), null) > 0) {
|
if (homeFragment != null && Helper.getUnreadToots(getApplicationContext(), null) > 0) {
|
||||||
homeFragment.refresh();
|
homeFragment.refresh();
|
||||||
}
|
}
|
||||||
Helper.clearUnreadToots(getApplicationContext(), null);
|
Helper.cacheStatusClear(getApplicationContext(), null);
|
||||||
updateHomeCounter();
|
updateHomeCounter();
|
||||||
}else if( tab.getPosition() == 1) {
|
}else if( tab.getPosition() == 1) {
|
||||||
fragmentTag = "NOTIFICATIONS";
|
fragmentTag = "NOTIFICATIONS";
|
||||||
|
@ -293,7 +301,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
if (notificationsFragment != null && Helper.getUnreadNotifications(getApplicationContext(), null) > 0) {
|
if (notificationsFragment != null && Helper.getUnreadNotifications(getApplicationContext(), null) > 0) {
|
||||||
notificationsFragment.refresh();
|
notificationsFragment.refresh();
|
||||||
}
|
}
|
||||||
Helper.clearUnreadNotifications(getApplicationContext(), null);
|
Helper.cacheNotificationsClear(getApplicationContext(), null);
|
||||||
updateNotifCounter();
|
updateNotifCounter();
|
||||||
}else if( tab.getPosition() == 2 && display_local) {
|
}else if( tab.getPosition() == 2 && display_local) {
|
||||||
|
|
||||||
|
@ -344,7 +352,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment);
|
DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment);
|
||||||
if( displayStatusFragment != null )
|
if( displayStatusFragment != null )
|
||||||
displayStatusFragment.scrollToTop();
|
displayStatusFragment.scrollToTop();
|
||||||
Helper.clearUnreadToots(getApplicationContext(), null);
|
Helper.cacheStatusClear(getApplicationContext(), null);
|
||||||
updateHomeCounter();
|
updateHomeCounter();
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
|
@ -357,7 +365,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment);
|
DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment);
|
||||||
if( displayNotificationsFragment != null )
|
if( displayNotificationsFragment != null )
|
||||||
displayNotificationsFragment.scrollToTop();
|
displayNotificationsFragment.scrollToTop();
|
||||||
Helper.clearUnreadNotifications(getApplicationContext(), null);
|
Helper.cacheNotificationsClear(getApplicationContext(), null);
|
||||||
updateNotifCounter();
|
updateNotifCounter();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -493,7 +501,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
.diskCache(new UnlimitedDiskCache(cacheDir))
|
.diskCache(new UnlimitedDiskCache(cacheDir))
|
||||||
.build();
|
.build();
|
||||||
imageLoader.init(configImg);
|
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)
|
options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(90)).cacheInMemory(false)
|
||||||
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
||||||
|
|
||||||
|
@ -511,8 +518,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
|
navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
LinearLayout owner_container = (LinearLayout) headerLayout.findViewById(R.id.owner_container);
|
LinearLayout owner_container = (LinearLayout) headerLayout.findViewById(R.id.owner_container);
|
||||||
owner_container.setOnClickListener(new View.OnClickListener() {
|
owner_container.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -923,7 +928,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
|
final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
|
||||||
unCheckAllMenuItems(navigationView);
|
unCheckAllMenuItems(navigationView);
|
||||||
item.setChecked(true);
|
item.setChecked(true);
|
||||||
|
|
||||||
//Remove the search bar
|
//Remove the search bar
|
||||||
if( !toolbar_search.isIconified() ) {
|
if( !toolbar_search.isIconified() ) {
|
||||||
toolbarTitle.setVisibility(View.VISIBLE);
|
toolbarTitle.setVisibility(View.VISIBLE);
|
||||||
|
@ -1196,10 +1200,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static boolean isActivityVisible() {
|
public static boolean isActivityVisible() {
|
||||||
return activityVisible;
|
return activityVisible;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue