Skip to content

Commit 9d41de6

Browse files
committed
Revert "Crash fix for Samsung devices after 2016 prod year"
This reverts commit 37f2356.
1 parent 37f2356 commit 9d41de6

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AppActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import android.support.v4.app.Fragment;
1616
import android.support.v4.app.FragmentManager;
1717
import android.support.v4.app.FragmentTransaction;
18-
import android.support.v4.content.LocalBroadcastManager;
1918
import android.support.v7.widget.RecyclerView;
2019
import android.util.Log;
2120
import android.view.Menu;
@@ -224,7 +223,7 @@ public void onReceive(Context context, Intent intent) {
224223
}
225224
};
226225
// Register LongPoll Broadcast Receiver
227-
LocalBroadcastManager.getInstance(this).registerReceiver(lpReceiver, new IntentFilter(
226+
registerReceiver(lpReceiver, new IntentFilter(
228227
"uk.openvk.android.legacy.LONGPOLL_RECEIVE"));
229228
}
230229

@@ -1420,7 +1419,7 @@ protected void onResume() {
14201419
@Override
14211420
protected void onDestroy() {
14221421
try {
1423-
LocalBroadcastManager.getInstance(this).unregisterReceiver(lpReceiver);
1422+
unregisterReceiver(lpReceiver);
14241423
} catch (Exception ignored) {
14251424

14261425
}

app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/NetworkActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.os.Message;
1313
import android.preference.PreferenceManager;
1414
import android.support.annotation.Nullable;
15-
import android.support.v4.content.LocalBroadcastManager;
1615
import android.util.Log;
1716

1817
import com.nostra13.universalimageloader.core.DisplayImageOptions;
@@ -71,7 +70,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
7170

7271
public void registerAPIDataReceiver() {
7372
receiver = new OvkAPIReceiver(this);
74-
LocalBroadcastManager.getInstance(this).registerReceiver(receiver, new IntentFilter(
73+
this.registerReceiver(receiver, new IntentFilter(
7574
"uk.openvk.android.legacy.API_DATA_RECEIVE"));
7675
}
7776

@@ -127,7 +126,7 @@ public void receiveState(int message, Bundle data) {
127126

128127
@Override
129128
protected void onDestroy() {
130-
LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver);
129+
unregisterReceiver(receiver);
131130
super.onDestroy();
132131
}
133132
}

app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/NetworkAuthActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.os.Message;
1313
import android.preference.PreferenceManager;
1414
import android.support.annotation.Nullable;
15-
import android.support.v4.content.LocalBroadcastManager;
1615
import android.util.Log;
1716

1817
import uk.openvk.android.legacy.BuildConfig;
@@ -66,7 +65,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6665

6766
public void registerAPIDataReceiver() {
6867
receiver = new OvkAPIReceiver(this);
69-
LocalBroadcastManager.getInstance(this).registerReceiver(receiver, new IntentFilter(
68+
this.registerReceiver(receiver, new IntentFilter(
7069
"uk.openvk.android.legacy.API_DATA_RECEIVE"));
7170
}
7271

@@ -122,7 +121,7 @@ public void receiveState(int message, Bundle data) {
122121

123122
@Override
124123
protected void onDestroy() {
125-
LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver);
124+
unregisterReceiver(receiver);
126125
super.onDestroy();
127126
}
128127
}

app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/NetworkFragmentActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.os.Message;
1313
import android.preference.PreferenceManager;
1414
import android.support.annotation.Nullable;
15-
import android.support.v4.content.LocalBroadcastManager;
1615
import android.util.Log;
1716

1817
import uk.openvk.android.legacy.BuildConfig;
@@ -66,7 +65,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6665

6766
public void registerAPIDataReceiver() {
6867
receiver = new OvkAPIReceiver(this);
69-
LocalBroadcastManager.getInstance(this).registerReceiver(receiver, new IntentFilter(
68+
this.registerReceiver(receiver, new IntentFilter(
7069
"uk.openvk.android.legacy.API_DATA_RECEIVE"));
7170
}
7271

@@ -123,7 +122,7 @@ public void receiveState(int message, Bundle data) {
123122

124123
@Override
125124
protected void onDestroy() {
126-
LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver);
125+
unregisterReceiver(receiver);
127126
super.onDestroy();
128127
}
129128
}

app/src/main/java/uk/openvk/android/legacy/ui/core/activities/intents/PhotoAlbumIntentActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6565
ProgressLayout progressLayout = ((ProgressLayout) findViewById(R.id.progress_layout));
6666
progressLayout.setVisibility(View.VISIBLE);
6767
progressLayout.enableDarkTheme(true);
68-
setTranslucentStatusBar(0, R.color.transparent_statusbar_color_black);
6968
if (savedInstanceState == null) {
7069
Bundle extras = getIntent().getExtras();
7170
if (extras == null) {
@@ -210,7 +209,7 @@ private void createPhotoAlbumAdapter() {
210209
flex_lm.setColumnCountProvider(new FlexibleGridLayoutManager.ColumnCountProvider() {
211210
@Override
212211
public int getColumnCount(int recyclerViewWidth) {
213-
return recyclerViewWidth / (int)(70.5 * getResources().getDisplayMetrics().scaledDensity);
212+
return recyclerViewWidth / (int)(43 * getResources().getDisplayMetrics().scaledDensity);
214213
}
215214
});
216215
photosList.setLayoutManager(flex_lm);

app/src/main/res/layout/list_item_photo_flexible.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<ImageView
99
android:id="@+id/photo_view"
10-
android:layout_width="80dp"
11-
android:layout_height="80dp"
10+
android:layout_width="48dp"
11+
android:layout_height="48dp"
1212
android:layout_gravity="center"
1313
android:adjustViewBounds="false"
1414
android:scaleType="centerCrop"

0 commit comments

Comments
 (0)