X Tutup
Skip to content

Commit 6ebcede

Browse files
cmelchiorcmelchior
authored
Revert progress listeners (realm#4414)
1 parent 9513da8 commit 6ebcede

File tree

24 files changed

+14
-1130
lines changed

24 files changed

+14
-1130
lines changed

‎CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* Linking objects are not yet supported on dynamic objects
1414
* Migration for linking objects is not yet supported.
1515
* Backlink verification is incomplete. Evil code can cause native crashes.
16-
* [ObjectServer] Added support for Sync Progress Notifications through `SyncSession.addDownloadProgressListener(ProgressMode, ProgressListener)` and `SyncSession.addUploadProgressListener(ProgressMode, ProgressListener)` (#4104).
1716
* [ObjectServer] In case of a Client Reset, information about the location of the backed up Realm file is now reported through the `ErrorHandler` interface (#4080).
1817
* [ObjectServer] Authentication URLs now automatically append `/auth` if no other path segment is set (#4370).
1918
* The listener on `RealmObject` will only be triggered if the object changes (#3894).

‎examples/objectServerExample/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ realm {
6161

6262
dependencies {
6363
compile 'com.android.support:support-v4:25.2.0'
64-
compile 'com.android.support:appcompat-v7:25.2.0'
6564
compile 'com.android.support:design:25.2.0'
66-
compile 'me.zhanghai.android.materialprogressbar:library:1.3.0'
6765
compile 'com.jakewharton:butterknife:8.3.0'
6866
annotationProcessor 'com.jakewharton:butterknife-compiler:8.3.0'
6967
}

‎examples/objectServerExample/src/main/java/io/realm/examples/objectserver/CounterActivity.java‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -17,67 +17,32 @@
1717
package io.realm.examples.objectserver;
1818

1919
import android.content.Intent;
20-
import android.graphics.PorterDuff;
2120
import android.os.Bundle;
22-
import android.support.annotation.ColorRes;
2321
import android.support.v7.app.AppCompatActivity;
2422
import android.view.Menu;
2523
import android.view.MenuItem;
26-
import android.view.View;
2724
import android.widget.TextView;
2825

2926
import java.util.Locale;
30-
import java.util.concurrent.atomic.AtomicBoolean;
3127

3228
import butterknife.BindView;
3329
import butterknife.ButterKnife;
3430
import butterknife.OnClick;
35-
import io.realm.Progress;
36-
import io.realm.ProgressListener;
37-
import io.realm.ProgressMode;
3831
import io.realm.Realm;
3932
import io.realm.RealmChangeListener;
4033
import io.realm.SyncConfiguration;
41-
import io.realm.SyncManager;
42-
import io.realm.SyncSession;
4334
import io.realm.SyncUser;
4435
import io.realm.examples.objectserver.model.CRDTCounter;
45-
import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
4636

4737
public class CounterActivity extends AppCompatActivity {
4838

4939
private static final String REALM_URL = "realm://" + BuildConfig.OBJECT_SERVER_IP + ":9080/~/default";
5040

5141
private Realm realm;
52-
private SyncSession session;
5342
private CRDTCounter counter;
5443
private SyncUser user;
55-
private AtomicBoolean downloadingChanges = new AtomicBoolean(false);
56-
private AtomicBoolean uploadingChanges = new AtomicBoolean(false);
57-
private ProgressListener downloadListener = new ProgressListener() {
58-
@Override
59-
public void onChange(Progress progress) {
60-
downloadingChanges.set(!progress.isTransferComplete());
61-
runOnUiThread(updateProgressBar);
62-
}
63-
};
64-
private ProgressListener uploadListener = new ProgressListener() {
65-
@Override
66-
public void onChange(Progress progress) {
67-
uploadingChanges.set(!progress.isTransferComplete());
68-
runOnUiThread(updateProgressBar);
69-
}
70-
};
71-
private Runnable updateProgressBar = new Runnable() {
72-
@Override
73-
public void run() {
74-
updateProgressBar(downloadingChanges.get(), uploadingChanges.get());
75-
}
76-
};
77-
7844

7945
@BindView(R.id.text_counter) TextView counterView;
80-
@BindView(R.id.progressbar) MaterialProgressBar progressBar;
8146

8247
@Override
8348
protected void onCreate(Bundle savedInstanceState) {
@@ -121,21 +86,12 @@ public void onChange(CRDTCounter counter) {
12186
}
12287
});
12388
counterView.setText("0");
124-
125-
// Setup progress listeners for indeterminate progress bars
126-
session = SyncManager.getSession(config);
127-
session.addDownloadProgressListener(ProgressMode.INDEFINITELY, downloadListener);
128-
session.addUploadProgressListener(ProgressMode.INDEFINITELY, uploadListener);
12989
}
13090
}
13191

13292
@Override
13393
protected void onStop() {
13494
super.onStop();
135-
if (session != null) {
136-
session.removeProgressListener(downloadListener);
137-
session.removeProgressListener(uploadListener);
138-
}
13995
closeRealm();
14096
user = null;
14197
}
@@ -176,22 +132,6 @@ public void decrementCounter() {
176132
adjustCounter(-1);
177133
}
178134

179-
private void updateProgressBar(boolean downloading, boolean uploading) {
180-
@ColorRes int color = android.R.color.black;
181-
int visibility = View.VISIBLE;
182-
if (downloading && uploading) {
183-
color = R.color.progress_both;
184-
} else if (downloading) {
185-
color = R.color.progress_download;
186-
} else if (uploading) {
187-
color = R.color.progress_upload;
188-
} else {
189-
visibility = View.GONE;
190-
}
191-
progressBar.getIndeterminateDrawable().setColorFilter(getResources().getColor(color), PorterDuff.Mode.SRC_IN);
192-
progressBar.setVisibility(visibility);
193-
}
194-
195135
private void adjustCounter(final int adjustment) {
196136
// A synchronized Realm can get written to at any point in time, so doing synchronous writes on the UI
197137
// thread is HIGHLY discouraged as it might block longer than intended. Only use async transactions.

‎examples/objectServerExample/src/main/res/layout/activity_counter.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<RelativeLayout
22
xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
xmlns:app="http://schemas.android.com/apk/res-auto">
6-
4+
android:layout_height="match_parent">
75

86
<LinearLayout
97
android:layout_width="match_parent"
@@ -36,15 +34,4 @@
3634
android:fontFamily="sans-serif-light"
3735
android:textSize="160sp"/>
3836

39-
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
40-
android:id="@+id/progressbar"
41-
android:layout_width="match_parent"
42-
android:layout_height="wrap_content"
43-
android:layout_gravity="top"
44-
android:indeterminate="true"
45-
app:mpb_progressStyle="horizontal"
46-
android:visibility="gone"
47-
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
48-
/>
49-
5037
</RelativeLayout>

‎examples/objectServerExample/src/main/res/values/realm_colors.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,4 @@
2020
<color name="flamingo_darker">#d64881</color>
2121
<color name="touch_area_pressed">#dadada</color>
2222

23-
// Progress bar colors
24-
<color name="progress_upload">#EF5350</color>
25-
<color name="progress_download">#9CCC65</color>
26-
<color name="progress_both">#FFA726</color>
27-
2823
</resources>

‎realm/realm-library/src/androidTestObjectServer/java/io/realm/ProgressTests.java‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎realm/realm-library/src/androidTestObjectServer/java/io/realm/SessionTests.java‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -61,54 +61,6 @@ public void get_syncValues() {
6161
assertEquals(configuration, session.getConfiguration());
6262
}
6363

64-
@Test
65-
public void addDownloadProgressListener_nullThrows() {
66-
SyncSession session = SyncManager.getSession(configuration);
67-
try {
68-
session.addDownloadProgressListener(ProgressMode.CURRENT_CHANGES, null);
69-
fail();
70-
} catch (IllegalArgumentException ignored) {
71-
}
72-
}
73-
74-
@Test
75-
public void addUploadProgressListener_nullThrows() {
76-
SyncSession session = SyncManager.getSession(configuration);
77-
try {
78-
session.addUploadProgressListener(ProgressMode.CURRENT_CHANGES, null);
79-
fail();
80-
} catch (IllegalArgumentException ignored) {
81-
}
82-
}
83-
84-
@Test
85-
public void removeProgressListener() {
86-
Realm realm = Realm.getInstance(configuration);
87-
SyncSession session = SyncManager.getSession(configuration);
88-
ProgressListener[] listeners = new ProgressListener[] {
89-
null,
90-
new ProgressListener() {
91-
@Override
92-
public void onChange(Progress progress) {
93-
// Listener 1, not present
94-
}
95-
},
96-
new ProgressListener() {
97-
@Override
98-
public void onChange(Progress progress) {
99-
// Listener 2, present
100-
}
101-
}
102-
};
103-
session.addDownloadProgressListener(ProgressMode.CURRENT_CHANGES, listeners[2]);
104-
105-
// Check that remove works unconditionally for all input
106-
for (ProgressListener listener : listeners) {
107-
session.removeProgressListener(listener);
108-
}
109-
realm.close();
110-
}
111-
11264
// Check that a Client Reset is correctly reported.
11365
@Test
11466
@RunTestInLooperThread

0 commit comments

Comments
 (0)
X Tutup