Skip to content
This repository has been archived by the owner on Sep 21, 2021. It is now read-only.

Commit

Permalink
fix: Linting, refactoring and CI (#59)
Browse files Browse the repository at this point in the history 
Closes: https://github.com/flyve-mdm/flyve-mdm-android-agent/issues/43, https://github.com/flyve-mdm/flyve-mdm-android-agent/issues/48 and https://github.com/flyve-mdm/flyve-mdm-android-agent/issues/3
  • Loading branch information
@rafaelje @ajsb85
rafaelje authored and ajsb85 committed Jun 23, 2017
1 parent 463d4a4 commit 4959d82
Show file tree
Hide file tree
Showing 14 changed files with 186 additions and 1,193 deletions.
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".SplashActivity">
<activity android:name=".SplashActivity" android:configChanges="orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".MainActivity">
<activity android:name=".MainActivity" android:configChanges="orientation|screenSize">
</activity>

<activity android:name=".RegisterActivity">
<activity android:name=".RegisterActivity" android:configChanges="orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
Expand Down
74 changes: 41 additions & 33 deletions app/src/main/java/com/teclib/data/DataStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

public class DataStorage {

private final String SHARED_PREFS_FILE = "FlyveHMPrefs";
private static final String SHARED_PREFS_FILE = "FlyveHMPrefs";
private Context mContext;

/**
Expand Down Expand Up @@ -63,44 +63,44 @@ public void setUrl(String url) {
setData("url", url);
}

public String getUser_token() {
public String getUserToken() {
return getData("user_token");
}

public void setUser_token(String user_token) {
setData("user_token", user_token);
public void setUserToken(String userToken) {
setData("user_token", userToken);
}

public String getInvitation_token() {
public String getInvitationToken() {
return getData("invitation_token");
}

public void setInvitation_token(String invitation_token) {
setData("invitation_token", invitation_token);
public void setInvitationToken(String invitationToken) {
setData("invitation_token", invitationToken);
}

public String getSession_token() {
public String getSessionToken() {
return getData("session_token");
}

public void setSession_token(String session_token) {
setData("session_token", session_token);
public void setSessionToken(String sessionToken) {
setData("session_token", sessionToken);
}

public String getProfile_id() {
public String getProfileId() {
return getData("profile_id");
}

public void setProfile_id(String profile_id) {
setData("profile_id", profile_id);
public void setProfileId(String profileId) {
setData("profile_id", profileId);
}

public String getAgent_id() {
public String getAgentId() {
return getData("agent_id");
}

public void setAgent_id(String agent_id) {
setData("agent_id", agent_id);
public void setAgentId(String agentId) {
setData("agent_id", agentId);
}

public String getBroker() {
Expand Down Expand Up @@ -167,53 +167,61 @@ public void setName(String name) {
setData("name", name);
}

public String getComputers_id() {
public String getComputersId() {
return getData("computers_id");
}

public void setComputers_id(String computers_id) {
setData("computers_id", computers_id);
public void setComputersId(String computersId) {
setData("computers_id", computersId);
}

public String getEntities_id() {
public String getEntitiesId() {
return getData("entities_id");
}

public void setEntities_id(String entities_id) {
setData("entities_id", entities_id);
public void setEntitiesId(String entitiesId) {
setData("entities_id", entitiesId);
}

public String getPlugin_flyvemdm_fleets_id() {
public String getPluginFlyvemdmFleetsId() {
return getData("plugin_flyvemdm_fleets_id");
}

public void setPlugin_flyvemdm_fleets_id(String plugin_flyvemdm_fleets_id) {
setData("plugin_flyvemdm_fleets_id", plugin_flyvemdm_fleets_id);
public void setPluginFlyvemdmFleetsId(String pluginFlyvemdmFleetsId) {
setData("plugin_flyvemdm_fleets_id", pluginFlyvemdmFleetsId);
}

private String getData(String key){
return getSettings().getString(key, null);
String data = "";
SharedPreferences sp = getSettings();
if(sp != null) {
data = sp.getString(key, null);
}
return data;
}

private void setData(String key, String value){
if(getSettings() != null) {
SharedPreferences.Editor editor = getSettings().edit();
private void setData(String key, String value) {
SharedPreferences sp = getSettings();
if(sp != null) {
SharedPreferences.Editor editor = sp.edit();
editor.putString(key, value );
editor.apply();
}
}

public void clearSettings(){
if(getSettings() != null) {
SharedPreferences.Editor editor = getSettings().edit();
SharedPreferences sp = getSettings();
if(sp != null) {
SharedPreferences.Editor editor = sp.edit();
editor.clear();
editor.apply();
}
}

public void deleteKeyCache(String llave){
if(getSettings() != null) {
SharedPreferences.Editor editor = getSettings().edit();
SharedPreferences sp = getSettings();
if(sp != null) {
SharedPreferences.Editor editor = sp.edit();
editor.remove(llave);
editor.apply();
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/teclib/flyvemdm/FlyveMDMApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@

public class FlyveMDMApp extends Application {

public static DataStorage cache;
private DataStorage cache;

@Override
public void onCreate() {
super.onCreate();

cache = new DataStorage(this);

}


public DataStorage getCache() {
return cache;
}
}
8 changes: 3 additions & 5 deletions app/src/main/java/com/teclib/flyvemdm/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ public class MainActivity extends AppCompatActivity {
private IntentFilter mIntent;

Intent mServiceIntent;
private MQTTService mMQTTService;

private TextView tvMsg;

@Override
Expand All @@ -58,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
// ------------------
// MQTT SERVICE
// ------------------
mMQTTService = new MQTTService();
MQTTService mMQTTService = new MQTTService();
mServiceIntent = new Intent(MainActivity.this, mMQTTService.getClass());
if (!isMyServiceRunning(mMQTTService.getClass())) {
startService(mServiceIntent);
Expand All @@ -72,11 +70,11 @@ private boolean isMyServiceRunning(Class<?> serviceClass) {
ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
if (serviceClass.getName().equals(service.service.getClassName())) {
Log.i ("isMyServiceRunning?", true+"");
Log.i ("isMyServiceRunning?", Boolean.toString( true ));
return true;
}
}
Log.i ("isMyServiceRunning?", false+"");
Log.i ("isMyServiceRunning?", Boolean.toString( false ));
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/teclib/flyvemdm/MainApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

public class MainApplication extends Application {

private static MainApplication instance;
private MainApplication instance;
protected Boolean isDebuggable;

@Override
Expand All @@ -49,7 +49,7 @@ public void onCreate() {
isDebuggable = ( 0 != ( getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
}

public static MainApplication getInstance(){
public MainApplication getInstance(){
return instance;
}

Expand Down
Loading

0 comments on commit 4959d82

Please sign in to comment.