Skip to content

Usage on memory #1259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daramirezv wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Usage on memory #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41dfdb5
improve connectivity issues
daramirezv May 5, 2019
a9c0125
memory changes
daramirezv May 10, 2019
1861a46
first change
daramirezv May 10, 2019
58367a2
weak ref
daramirezv May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import android.view.MenuItem;
import android.view.View;

import java.lang.ref.WeakReference;

import javax.inject.Inject;

import io.github.hidroh.materialistic.annotation.Synthetic;
Expand Down Expand Up @@ -375,9 +377,9 @@ private void openSinglePaneItem() {
if (mExternalBrowser && mStoryViewMode != Preferences.StoryViewMode.Comment) {
AppUtils.openWebUrlExternal(this, mSelectedItem, mSelectedItem.getUrl(), mCustomTabsDelegate.getSession());
} else {
Intent intent = new Intent(this, ItemActivity.class)
Intent intent = new WeakReference<>(new Intent(this, ItemActivity.class)
.putExtra(ItemActivity.EXTRA_CACHE_MODE, getItemCacheMode())
.putExtra(ItemActivity.EXTRA_ITEM, mSelectedItem);
.putExtra(ItemActivity.EXTRA_ITEM, mSelectedItem)).get();
startActivity(mMultiWindowEnabled ? AppUtils.multiWindowIntent(this, intent) : intent);
}
}
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import android.view.ViewGroup;
import android.widget.TextView;

import java.lang.ref.WeakReference;

import javax.inject.Inject;

import io.github.hidroh.materialistic.annotation.Synthetic;
Expand Down Expand Up @@ -72,14 +74,14 @@ protected void onCreate(Bundle savedInstanceState) {
public void onDrawerClosed(View drawerView) {
super.onDrawerClosed(drawerView);
if (drawerView.equals(mDrawer) && mPendingNavigation != null) {
final Intent intent = new Intent(DrawerActivity.this, mPendingNavigation);
WeakReference<Intent> intent = new WeakReference<>(new Intent(DrawerActivity.this, mPendingNavigation));
if (mPendingNavigationExtras != null) {
intent.putExtras(mPendingNavigationExtras);
intent.get().putExtras(mPendingNavigationExtras);
mPendingNavigationExtras = null;
}
// TODO M bug https://code.google.com/p/android/issues/detail?id=193822
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent);
intent.get().setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent.get());
mPendingNavigation = null;
}
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import android.content.Intent;
import android.os.Bundle;

import java.lang.ref.WeakReference;
import java.util.HashMap;

public class LauncherActivity extends Activity {
Expand All @@ -36,8 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
map.put(getString(R.string.pref_launch_screen_value_jobs), JobsActivity.class);
map.put(getString(R.string.pref_launch_screen_value_saved), FavoriteActivity.class);
String launchScreen = Preferences.getLaunchScreen(this);
startActivity(new Intent(this, map.containsKey(launchScreen) ?
map.get(launchScreen) : ListActivity.class));
startActivity(new WeakReference<>(new Intent(this, map.containsKey(launchScreen) ?
map.get(launchScreen) : ListActivity.class)).get());
finish();
}
}
26 changes: 14 additions & 12 deletions app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import android.view.Menu;
import android.view.MenuItem;

import java.lang.ref.WeakReference;

import javax.inject.Inject;

import io.github.hidroh.materialistic.data.SearchRecentSuggestionsProvider;
Expand All @@ -40,29 +42,29 @@ protected void onCreate(Bundle savedInstanceState) {
getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME |
ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE);
findViewById(R.id.drawer_display).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class)
.putExtra(PreferencesActivity.EXTRA_TITLE, R.string.display)
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_display)));
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_display)).get()));
findViewById(R.id.drawer_offline).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class)
.putExtra(PreferencesActivity.EXTRA_TITLE, R.string.offline)
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_offline)));
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_offline)).get()));
findViewById(R.id.menu_list).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class)
.putExtra(PreferencesActivity.EXTRA_TITLE, R.string.list_display_options)
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_list)));
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_list)).get()));
findViewById(R.id.menu_comments).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class)
.putExtra(PreferencesActivity.EXTRA_TITLE, R.string.comments)
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_comments)));
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_comments)).get()));
findViewById(R.id.menu_readability).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class)
.putExtra(PreferencesActivity.EXTRA_TITLE, R.string.readability)
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability)));
.putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability)).get()));
findViewById(R.id.drawer_about).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, AboutActivity.class)));
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, AboutActivity.class)).get()));
findViewById(R.id.drawer_release).setOnClickListener(v ->
startActivity(new Intent(SettingsActivity.this, ReleaseNotesActivity.class)));
startActivity(new WeakReference<>(new Intent(SettingsActivity.this, ReleaseNotesActivity.class)).get()));
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ void onSubmitted(Boolean successful) {
} else if (successful) {
Toast.makeText(this, R.string.submit_successful, Toast.LENGTH_SHORT).show();
if (!isFinishing()) {
Intent intent = new Intent(this, NewActivity.class);
intent.putExtra(NewActivity.EXTRA_REFRESH, true);
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent); // TODO should go to profile instead?
WeakReference<Intent> intent = new WeakReference<> (new Intent(this, NewActivity.class));
intent.get().putExtra(NewActivity.EXTRA_REFRESH, true);
intent.get().setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent.get()); // TODO should go to profile instead?
finish();
}
} else if (!isFinishing()) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ private void showMoreOptions(View v, final Favorite item) {
return true;
}
if (menuItem.getItemId() == R.id.menu_contextual_comment) {
mContext.startActivity(new Intent(mContext, ComposeActivity.class)
mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class)
.putExtra(ComposeActivity.EXTRA_PARENT_ID, item.getId())
.putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getDisplayedTitle()));
.putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getDisplayedTitle())).get());
return true;
}
if (menuItem.getItemId() == R.id.menu_contextual_share) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ private void bindActions(final VH holder, final Item item) {
return true;
}
if (menuItem.getItemId() == R.id.menu_contextual_comment) {
mContext.startActivity(new Intent(mContext, ComposeActivity.class)
mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class)
.putExtra(ComposeActivity.EXTRA_PARENT_ID, item.getId())
.putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getText()));
.putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getText())).get());
return true;
}
if (menuItem.getItemId() == R.id.menu_contextual_share) {
Expand Down
5 changes: 3 additions & 2 deletions ...src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import android.view.View;
import android.view.ViewGroup;

import java.lang.ref.WeakReference;
import java.util.Arrays;

import io.github.hidroh.materialistic.ItemActivity;
Expand Down Expand Up @@ -88,8 +89,8 @@ public int getItemCount() {
}

private void openItem(Item item) {
mContext.startActivity(new Intent(mContext, ItemActivity.class)
mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class)
.putExtra(ItemActivity.EXTRA_ITEM, item)
.putExtra(ItemActivity.EXTRA_OPEN_COMMENTS, true));
.putExtra(ItemActivity.EXTRA_OPEN_COMMENTS, true)).get());
}
}
8 changes: 4 additions & 4 deletions app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,15 @@ void showMoreOptions(View v, final Item story, final ItemViewHolder holder) {
return true;
}
if (item.getItemId() == R.id.menu_contextual_comment) {
mContext.startActivity(new Intent(mContext, ComposeActivity.class)
mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class)
.putExtra(ComposeActivity.EXTRA_PARENT_ID, story.getId())
.putExtra(ComposeActivity.EXTRA_PARENT_TEXT,
story.getDisplayedTitle()));
story.getDisplayedTitle())).get());
return true;
}
if (item.getItemId() == R.id.menu_contextual_profile) {
mContext.startActivity(new Intent(mContext, UserActivity.class)
.putExtra(UserActivity.EXTRA_USERNAME, story.getBy()));
mContext.startActivity(new WeakReference<> (new Intent(mContext, UserActivity.class)
.putExtra(UserActivity.EXTRA_USERNAME, story.getBy())).get());
return true;
}
if (item.getItemId() == R.id.menu_contextual_share) {
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import android.view.View;
import android.view.ViewGroup;

import java.lang.ref.WeakReference;

import io.github.hidroh.materialistic.ItemActivity;
import io.github.hidroh.materialistic.R;
import io.github.hidroh.materialistic.ThreadPreviewActivity;
Expand Down Expand Up @@ -98,12 +100,12 @@ protected void bind(final SubmissionViewHolder holder, final Item item) {
}

private void openItem(Item item) {
mContext.startActivity(new Intent(mContext, ItemActivity.class)
.putExtra(ItemActivity.EXTRA_ITEM, item));
mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class)
.putExtra(ItemActivity.EXTRA_ITEM, item)).get());
}

private void openPreview(Item item) {
mContext.startActivity(new Intent(mContext, ThreadPreviewActivity.class)
.putExtra(ThreadPreviewActivity.EXTRA_ITEM, item));
mContext.startActivity(new WeakReference<>(new Intent(mContext, ThreadPreviewActivity.class)
.putExtra(ThreadPreviewActivity.EXTRA_ITEM, item)).get());
}
}
5 changes: 3 additions & 2 deletions ...src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import android.view.View;
import android.view.ViewGroup;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -115,7 +116,7 @@ protected Item getItem(int position) {
}

private void openItem(Item item) {
mContext.startActivity(new Intent(mContext, ItemActivity.class)
.putExtra(ItemActivity.EXTRA_ITEM, item));
mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class)
.putExtra(ItemActivity.EXTRA_ITEM, item)).get());
}
}
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Feb 18 12:33:25 EST 2019
#Wed May 08 19:58:00 COT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip