Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
53da1379
Commit
53da1379
authored
Oct 24, 2018
by
akwizgran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1422-activity-log' into 'master'
Log when activities start and stop See merge request
!959
parents
2ab03f48
5c28b60a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
BaseActivity.java
...org/briarproject/briar/android/activity/BaseActivity.java
+9
-0
BriarRecyclerView.java
...rg/briarproject/briar/android/view/BriarRecyclerView.java
+1
-8
No files found.
briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java
View file @
53da1379
...
...
@@ -34,6 +34,7 @@ import org.briarproject.briar.api.android.ScreenFilterMonitor.AppDetails;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.logging.Logger
;
import
javax.annotation.Nullable
;
import
javax.inject.Inject
;
...
...
@@ -42,6 +43,8 @@ import static android.arch.lifecycle.Lifecycle.State.STARTED;
import
static
android
.
view
.
ViewGroup
.
LayoutParams
.
MATCH_PARENT
;
import
static
android
.
view
.
WindowManager
.
LayoutParams
.
FLAG_SECURE
;
import
static
android
.
view
.
inputmethod
.
InputMethodManager
.
SHOW_IMPLICIT
;
import
static
java
.
util
.
logging
.
Level
.
INFO
;
import
static
java
.
util
.
logging
.
Logger
.
getLogger
;
import
static
org
.
briarproject
.
briar
.
android
.
TestingConstants
.
PREVENT_SCREENSHOTS
;
/**
...
...
@@ -51,6 +54,8 @@ import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOT
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
DestroyableContext
,
OnTapFilteredListener
{
private
final
static
Logger
LOG
=
getLogger
(
BaseActivity
.
class
.
getName
());
@Inject
protected
ScreenFilterMonitor
screenFilterMonitor
;
...
...
@@ -119,6 +124,8 @@ public abstract class BaseActivity extends AppCompatActivity
@Override
protected
void
onStart
()
{
super
.
onStart
();
if
(
LOG
.
isLoggable
(
INFO
))
LOG
.
info
(
"Starting "
+
this
.
getClass
().
getSimpleName
());
for
(
ActivityLifecycleController
alc
:
lifecycleControllers
)
{
alc
.
onActivityStart
();
}
...
...
@@ -137,6 +144,8 @@ public abstract class BaseActivity extends AppCompatActivity
@Override
protected
void
onStop
()
{
super
.
onStop
();
if
(
LOG
.
isLoggable
(
INFO
))
LOG
.
info
(
"Stopping "
+
this
.
getClass
().
getSimpleName
());
for
(
ActivityLifecycleController
alc
:
lifecycleControllers
)
{
alc
.
onActivityStop
();
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java
View file @
53da1379
...
...
@@ -20,17 +20,12 @@ import android.widget.TextView;
import
org.briarproject.briar.R
;
import
java.util.logging.Logger
;
import
javax.annotation.Nullable
;
import
static
org
.
briarproject
.
briar
.
android
.
util
.
UiUtils
.
MIN_DATE_RESOLUTION
;
public
class
BriarRecyclerView
extends
FrameLayout
{
private
static
final
Logger
LOG
=
Logger
.
getLogger
(
BriarRecyclerView
.
class
.
getName
());
private
final
Handler
handler
=
new
Handler
(
Looper
.
getMainLooper
());
private
RecyclerView
recyclerView
;
...
...
@@ -39,6 +34,7 @@ public class BriarRecyclerView extends FrameLayout {
private
TextView
emptyText
,
emptyAction
;
private
ProgressBar
progressBar
;
private
RecyclerView
.
AdapterDataObserver
emptyObserver
;
@Nullable
private
Runnable
refresher
=
null
;
private
boolean
isScrollingToEnd
=
false
;
...
...
@@ -217,18 +213,15 @@ public class BriarRecyclerView extends FrameLayout {
throw
new
IllegalStateException
(
"Need to call setAdapter() first!"
);
}
refresher
=
()
->
{
LOG
.
info
(
"Updating Content..."
);
Adapter
adapter
=
recyclerView
.
getAdapter
();
adapter
.
notifyItemRangeChanged
(
0
,
adapter
.
getItemCount
());
handler
.
postDelayed
(
refresher
,
MIN_DATE_RESOLUTION
);
};
LOG
.
info
(
"Adding Handler Callback"
);
handler
.
postDelayed
(
refresher
,
MIN_DATE_RESOLUTION
);
}
public
void
stopPeriodicUpdate
()
{
if
(
refresher
!=
null
)
{
LOG
.
info
(
"Removing Handler Callback"
);
handler
.
removeCallbacks
(
refresher
);
refresher
=
null
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment