Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hds
flexin
android-app
Commits
6c9220aa
Commit
6c9220aa
authored
Nov 06, 2017
by
Nastuzzi Samy
Browse files
Broadcast receiver bug
BaseActivity can't handle InternetBroadcast
parent
28198755
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/fr/utc/simde/payutc/BaseActivity.java
View file @
6c9220aa
...
...
@@ -34,8 +34,6 @@ public abstract class BaseActivity extends NFCActivity {
protected
static
NemopaySession
nemopaySession
;
protected
static
CASConnexion
casConnexion
;
protected
static
InternetBroadcast
internetBroadcast
;
protected
static
Config
config
;
protected
static
Dialog
dialog
;
...
...
@@ -44,8 +42,6 @@ public abstract class BaseActivity extends NFCActivity {
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
this
.
internetBroadcast
=
new
InternetBroadcast
();
registerReceiver
(
this
.
internetBroadcast
,
new
IntentFilter
(
ConnectivityManager
.
CONNECTIVITY_ACTION
));
dialog
=
new
Dialog
(
this
);
}
...
...
@@ -53,7 +49,6 @@ public abstract class BaseActivity extends NFCActivity {
protected
void
onDestroy
()
{
super
.
onDestroy
();
unregisterReceiver
(
this
.
internetBroadcast
);
dialog
.
dismiss
();
}
...
...
app/src/main/java/fr/utc/simde/payutc/MainActivity.java
View file @
6c9220aa
...
...
@@ -5,6 +5,7 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.IntentFilter
;
import
android.content.SharedPreferences
;
import
android.graphics.Bitmap
;
import
android.graphics.BitmapFactory
;
...
...
@@ -35,6 +36,7 @@ import java.util.Map;
import
fr.utc.simde.payutc.tools.CASConnexion
;
import
fr.utc.simde.payutc.tools.Config
;
import
fr.utc.simde.payutc.tools.Dialog
;
import
fr.utc.simde.payutc.tools.InternetBroadcast
;
import
fr.utc.simde.payutc.tools.NemopaySession
;
public
class
MainActivity
extends
BaseActivity
{
...
...
@@ -46,6 +48,8 @@ public class MainActivity extends BaseActivity {
private
static
TextView
appRegisteredText
;
private
static
Button
usernameButton
;
protected
static
InternetBroadcast
internetBroadcast
;
private
static
SharedPreferences
sharedPreferences
;
@Override
...
...
@@ -59,6 +63,9 @@ public class MainActivity extends BaseActivity {
casConnexion
=
new
CASConnexion
(
nemopaySession
);
config
=
new
Config
(
sharedPreferences
);
this
.
internetBroadcast
=
new
InternetBroadcast
();
registerReceiver
(
this
.
internetBroadcast
,
new
IntentFilter
(
ConnectivityManager
.
CONNECTIVITY_ACTION
));
final
String
key
=
sharedPreferences
.
getString
(
"key"
,
""
);
if
(!
key
.
equals
(
""
))
setKey
(
key
);
...
...
@@ -108,6 +115,7 @@ public class MainActivity extends BaseActivity {
protected
void
onDestroy
()
{
super
.
onDestroy
();
unregisterReceiver
(
this
.
internetBroadcast
);
disconnect
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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