Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
5ea6350
0.4.2 builds in adnrodid studio
h0pbeat Oct 14, 2015
d8494aa
added build version information
h0pbeat Aug 30, 2015
de05404
updated build script to take most recent tag instead of exact match
h0pbeat Aug 30, 2015
4f1b6ce
removed build.info from tracking
h0pbeat Aug 30, 2015
fe61fde
implemented gzip compression of the files, configurable in pipeline c…
h0pbeat Aug 30, 2015
adb0236
updated fields for location probe
h0pbeat Aug 30, 2015
cd5c86b
switched to nicer stream chaining
h0pbeat Aug 31, 2015
0e425ba
wifi probe now includes exclusion and can emit scan started data
h0pbeat Aug 31, 2015
12b99c6
Merge pull request #2 from OpenSensing/compressed_archive
RaduGatej Aug 31, 2015
0f054f9
empirically 30 seconds is not enough for a full BT scan in dense envi…
h0pbeat Sep 1, 2015
8993f14
bluetooth probe now includes exclusion and can emit scan started data
h0pbeat Sep 1, 2015
4f80206
added changelog
h0pbeat Sep 2, 2015
eaa5d07
Create LICENSE.md
h0pbeat Sep 22, 2015
0f4fbb1
Merge pull request #13 from OpenSensing/license
RaduGatej Sep 22, 2015
792e1cb
working on file uploading
h0pbeat Sep 23, 2015
b61579c
Merge pull request #3 from OpenSensing/probes_config_cleaning
RaduGatej Sep 23, 2015
3886b76
Removed unnecessary dependencies
h0pbeat Sep 23, 2015
ae977a4
Creating folder for assets if doesn't exist
h0pbeat Sep 23, 2015
87bf11f
Just import reshuffling
h0pbeat Sep 23, 2015
fc77f8a
Better URL validation
h0pbeat Sep 23, 2015
5d87480
Additional URI check
h0pbeat Sep 23, 2015
e03552e
Resetting number of failures on run not just on start
h0pbeat Sep 23, 2015
98d93c5
Experimental change to InputStreamEntity
h0pbeat Sep 24, 2015
cf60d04
Formatting of url in config updater
h0pbeat Sep 28, 2015
c0141b4
Formatting of url, inserting filename and access token
h0pbeat Sep 28, 2015
377edaf
Support for token setting and broadcast of authentication error
h0pbeat Sep 28, 2015
c0688b8
Added todo for the future
h0pbeat Sep 28, 2015
2e8f0d9
File uploader now supports string formatting and auth error
h0pbeat Sep 28, 2015
d98624d
Just removing todo
h0pbeat Sep 28, 2015
5117a62
Saving token not for the exact url but for the host, so the config ca…
h0pbeat Sep 28, 2015
35cf8ba
httpGet with response code so we can handle auth errors
h0pbeat Sep 28, 2015
d3a70bd
Getting access token by host not by full url
h0pbeat Sep 28, 2015
0607f4d
Little safeguards to file uploader
h0pbeat Oct 5, 2015
27967d8
Building proper file suffix
h0pbeat Oct 5, 2015
5ee4f91
Merge pull request #14 from OpenSensing/file_uploader
RaduGatej Oct 5, 2015
570de17
Updated changelog
h0pbeat Oct 5, 2015
6b22d49
Merge pull request #17 from OpenSensing/release_4-3
RaduGatej Oct 13, 2015
9511946
Merge branch 'v0.4.3'
h0pbeat Oct 16, 2015
e04ed01
Geofencing can be now used to limit data collection
h0pbeat Oct 18, 2015
f2d561f
Broadcasting data collections status
h0pbeat Oct 18, 2015
e1b41e6
Better state broadcasting
h0pbeat Oct 19, 2015
0636c10
Bluetooth Probe can be now configured to keep phone discoverable
h0pbeat Dec 1, 2015
22043fe
Merge branch 'dev' of github.com:OpenSensing/funf-core-android into dev
h0pbeat Dec 6, 2015
db2868e
Removed silly logging
h0pbeat Dec 6, 2015
24a7d78
Better handling of authentication and errors
h0pbeat Dec 6, 2015
7bc7ec5
Better httpGet using HttpURLConnection
h0pbeat Dec 6, 2015
136ac11
Pipeline can be now configured to use json files instead of sliqte3
h0pbeat Dec 11, 2015
cb12929
Added mcc and mnc, required for proper cell geolocation
h0pbeat Dec 11, 2015
4dd88ed
Changed default backup to much smaller and made json db
h0pbeat Dec 11, 2015
254a4e8
device can now have a unique ID attached to BT name
h0pbeat Dec 18, 2015
0da4458
Added descriptions to probes
h0pbeat Dec 20, 2015
231f30f
Changed order of BT operations, just in case
h0pbeat Dec 20, 2015
49b4d4e
Broadcasting 500 error in case application wants to react to it
h0pbeat Dec 20, 2015
057e0a8
Support for setting and getting application strings
h0pbeat Dec 20, 2015
83c49a8
Protection against overwriting existing archive files. Just in case.
h0pbeat Dec 20, 2015
dfe27ac
Saving funf version and application version in the database file
h0pbeat Dec 20, 2015
7162d9c
Fix for data being lost after a crash and support for temp file when …
h0pbeat Dec 20, 2015
3c72c7c
Updated geofencer not to fire probes when outside of the fence
h0pbeat Dec 20, 2015
76f6a8a
Removed unused dependencies, woot
h0pbeat Dec 20, 2015
3fedc70
updated CHANGELOG
h0pbeat Dec 20, 2015
bff60cc
updated changelog
h0pbeat Dec 20, 2015
6eedd9a
updated changelog
h0pbeat Dec 20, 2015
f2c00a2
Create README.md
RaduGatej Apr 24, 2016
8416a04
Merge pull request #20 from OpenSensing/RaduGatej-patch-1
RaduGatej Apr 25, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,36 @@ bin/*
gen/*
*.log
local.properties
# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/
.DS_Store
.idea
*.iml
build.info
72 changes: 72 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Change Log

## [0.4.4](https://github.com/OpenSensing/funf-core-android/tree/0.4.4) (2015-12-20)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.4.3...0.4.4)

**Implemented enhancements:**

- Support for Bluetooth identifier [\#12](https://github.com/OpenSensing/funf-core-android/issues/12)
- Introduce JSON database file [\#11](https://github.com/OpenSensing/funf-core-android/issues/11)
- Improve HTTP get [\#10](https://github.com/OpenSensing/funf-core-android/issues/10)
- Communication of funf status [\#9](https://github.com/OpenSensing/funf-core-android/issues/9)
- Geofencing to limit data collection [\#8](https://github.com/OpenSensing/funf-core-android/issues/8)
- Bluetooth discoverability [\#1](https://github.com/OpenSensing/funf-core-android/issues/1)

**Merged pull requests:**

- Json db [\#7](https://github.com/OpenSensing/funf-core-android/pull/7) ([h0pbeat](https://github.com/h0pbeat))
- Geofencing [\#6](https://github.com/OpenSensing/funf-core-android/pull/6) ([h0pbeat](https://github.com/h0pbeat))
- Bluetooth Probe can be now configured to keep phone discoverable [\#5](https://github.com/OpenSensing/funf-core-android/pull/5) ([h0pbeat](https://github.com/h0pbeat))

## [0.4.3](https://github.com/OpenSensing/funf-core-android/tree/0.4.3) (2015-10-16)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/v0.5.0RC1...0.4.3)

**Implemented enhancements:**

- Add stub for exclusion of fields to Wifi probe [\#12](https://github.com/OpenSensing/funf-v4/issues/12)
- Add stub for exclusion of fields to Bluetooth probe [\#11](https://github.com/OpenSensing/funf-v4/issues/11)
- Add LGPL license file [\#10](https://github.com/OpenSensing/funf-v4/issues/10)
- Include datapoint when Wifi scan starts, even if no devices are found [\#9](https://github.com/OpenSensing/funf-v4/issues/9)
- Include datapoint when Bluetooth scan starts, even if no devices are found [\#8](https://github.com/OpenSensing/funf-v4/issues/8)
- Change BT probe default duration to 60s [\#7](https://github.com/OpenSensing/funf-v4/issues/7)
- Change file uploader to HttpClient [\#6](https://github.com/OpenSensing/funf-v4/issues/6)
- Add changelog [\#4](https://github.com/OpenSensing/funf-v4/issues/4)
- Option to compress archives \(using gzip\) [\#1](https://github.com/OpenSensing/funf-v4/issues/1)

**Closed issues:**

- Generate archive file extension based on the compression/encryption [\#15](https://github.com/OpenSensing/funf-v4/issues/15)

**Merged pull requests:**

- File uploader [\#14](https://github.com/OpenSensing/funf-v4/pull/14) ([h0pbeat](https://github.com/h0pbeat))
- Added license file [\#13](https://github.com/OpenSensing/funf-v4/pull/13) ([h0pbeat](https://github.com/h0pbeat))
- added changelog [\#5](https://github.com/OpenSensing/funf-v4/pull/5) ([h0pbeat](https://github.com/h0pbeat))
- small cleaning and enhancements of the probes [\#3](https://github.com/OpenSensing/funf-v4/pull/3) ([h0pbeat](https://github.com/h0pbeat))
- implemented gzip compression of the files, configurable in pipeline config [\#2](https://github.com/OpenSensing/funf-v4/pull/2) ([h0pbeat](https://github.com/h0pbeat))

## [v0.5.0RC1](https://github.com/OpenSensing/funf-core-android/tree/v0.5.0RC1) (2013-09-19)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.4.2...v0.5.0RC1)

## [0.4.2](https://github.com/OpenSensing/funf-core-android/tree/0.4.2) (2013-04-10)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.4.1...0.4.2)

## [0.4.1](https://github.com/OpenSensing/funf-core-android/tree/0.4.1) (2013-04-06)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.4.0...0.4.1)

## [0.4.0](https://github.com/OpenSensing/funf-core-android/tree/0.4.0) (2013-03-27)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.3.1...0.4.0)

## [0.3.1](https://github.com/OpenSensing/funf-core-android/tree/0.3.1) (2012-04-03)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.3.0...0.3.1)

## [0.3.0](https://github.com/OpenSensing/funf-core-android/tree/0.3.0) (2011-11-03)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.2.1...0.3.0)

## [0.2.1](https://github.com/OpenSensing/funf-core-android/tree/0.2.1) (2011-10-07)
[Full Changelog](https://github.com/OpenSensing/funf-core-android/compare/0.2.0...0.2.1)

## [0.2.0](https://github.com/OpenSensing/funf-core-android/tree/0.2.0) (2011-10-05)


\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
165 changes: 165 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
17 changes: 0 additions & 17 deletions README

This file was deleted.

23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Funf Open Sensing Framework
Fork of the popular [Funf open sensing framework](https://github.com/funf-org/funf-core-android) which has been inactive for some years.
Currently developed for and used in data collection projects at Google and at the Technical University of Denmark.

For details about architecture design, documentation as well as scripts for processing collected data, see the original repo's [wiki](https://github.com/funf-org/funf-core-android/wiki).

# Improvements
Forked from Funf v0.4.2. See the [changelog](https://github.com/OpenSensing/funf-core-android/blob/master/CHANGELOG.md) for the full set of improvements over v0.4.2. Some of the more important ones include:
* Geofencing
* Gzipping of files before upload
* Token based authentication
* File storage in JSON format
* Gradle integration

# How to build
Run ./gradlew assembleRelease in the project root to produce an .aar that you can use as a library in your Android app.

# Usage
Funf is meant to be used as a dependency for another Android app that can provide user interaction and data collection configuration. See original project for a [tutorial](https://github.com/funf-org/funf-core-android/wiki/WifiScannerTutorial) on this.




19 changes: 0 additions & 19 deletions ant.properties

This file was deleted.

15 changes: 15 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
}
}

allprojects {
repositories {
jcenter()
}
}
Loading