Skip to content

Commit

Permalink
Update version.
Browse files Browse the repository at this point in the history 
Reformat the code.
  • Loading branch information
@ruiaraujo
ruiaraujo committed Jun 1, 2015
1 parent ca562ef commit 99b823b
Show file tree
Hide file tree
Showing 131 changed files with 7,540 additions and 7,548 deletions.
28 changes: 13 additions & 15 deletions android/aFileChooser/src/main/java/com/ipaulpro/afilechooser/FileListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,9 @@
public class FileListFragment extends ListFragment implements
LoaderManager.LoaderCallbacks<List<File>> {

/**
* Interface to listen for events.
*/
public interface Callbacks {
/**
* Called when a file is selected from the list.
*
* @param file The file selected
*/
public void onFileSelected(File file);
}

private static final int LOADER_ID = 0;

private FileListAdapter mAdapter;
private String mPath;

private Callbacks mListener;

/**
Expand Down Expand Up @@ -108,7 +94,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
public void onListItemClick(ListView l, View v, int position, long id) {
FileListAdapter adapter = (FileListAdapter) l.getAdapter();
if (adapter != null) {
File file = (File) adapter.getItem(position);
File file = adapter.getItem(position);
mPath = file.getAbsolutePath();
mListener.onFileSelected(file);
}
Expand All @@ -133,4 +119,16 @@ public void onLoadFinished(Loader<List<File>> loader, List<File> data) {
public void onLoaderReset(Loader<List<File>> loader) {
mAdapter.clear();
}

/**
* Interface to listen for events.
*/
public interface Callbacks {
/**
* Called when a file is selected from the list.
*
* @param file The file selected
*/
void onFileSelected(File file);
}
}
110 changes: 51 additions & 59 deletions android/aFileChooser/src/main/java/com/ipaulpro/afilechooser/utils/FileUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,57 @@
* @author paulburke (ipaulpro)
*/
public class FileUtils {
private FileUtils() {} //private constructor to enforce Singleton pattern

/** TAG for log messages. */
static final String TAG = "FileUtils";
private static final boolean DEBUG = false; // Set to true to enable logging

public static final String MIME_TYPE_AUDIO = "audio/*";
public static final String MIME_TYPE_TEXT = "text/*";
public static final String MIME_TYPE_IMAGE = "image/*";
public static final String MIME_TYPE_VIDEO = "video/*";
public static final String MIME_TYPE_APP = "application/*";

public static final String HIDDEN_PREFIX = ".";
/** TAG for log messages. */
static final String TAG = "FileUtils";
private static final boolean DEBUG = false; // Set to true to enable logging
/**
* File and folder comparator. TODO Expose sorting option method
*
* @author paulburke
*/
public static Comparator<File> sComparator = new Comparator<File>() {
@Override
public int compare(File f1, File f2) {
// Sort alphabetically by lower case, which is much cleaner
return f1.getName().toLowerCase().compareTo(
f2.getName().toLowerCase());
}
};
/**
* File (not directories) filter.
*
* @author paulburke
*/
public static FileFilter sFileFilter = new FileFilter() {
@Override
public boolean accept(File file) {
final String fileName = file.getName();
// Return files only (not directories) and skip hidden files
return file.isFile() && !fileName.startsWith(HIDDEN_PREFIX);
}
};
/**
* Folder (directories) filter.
*
* @author paulburke
*/
public static FileFilter sDirFilter = new FileFilter() {
@Override
public boolean accept(File file) {
final String fileName = file.getName();
// Return directories only and skip hidden directories
return file.isDirectory() && !fileName.startsWith(HIDDEN_PREFIX);
}
};

private FileUtils() {
} //private constructor to enforce Singleton pattern

/**
* Gets the extension of a file name, like ".png" or ".jpg".
Expand All @@ -84,10 +122,7 @@ public static String getExtension(String uri) {
* @return Whether the URI is a local one.
*/
public static boolean isLocal(String url) {
if (url != null && !url.startsWith("http://") && !url.startsWith("https://")) {
return true;
}
return false;
return url != null && !url.startsWith("http://") && !url.startsWith("https://");
}

/**
Expand Down Expand Up @@ -215,7 +250,7 @@ public static boolean isGooglePhotosUri(Uri uri) {
* @author paulburke
*/
public static String getDataColumn(Context context, Uri uri, String selection,
String[] selectionArgs) {
String[] selectionArgs) {

Cursor cursor = null;
final String column = "_data";
Expand Down Expand Up @@ -247,7 +282,7 @@ public static String getDataColumn(Context context, Uri uri, String selection,
* <br>
* Callers should check whether the path is local before assuming it
* represents a local file.
*
*
* @param context The context.
* @param uri The Uri to query.
* @see #isLocal(String)
Expand All @@ -265,7 +300,7 @@ public static String getPath(final Context context, final Uri uri) {
", Scheme: " + uri.getScheme() +
", Host: " + uri.getHost() +
", Segments: " + uri.getPathSegments().toString()
);
);

final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;

Expand Down Expand Up @@ -313,7 +348,7 @@ else if (isMediaDocument(uri)) {
}

final String selection = "_id=?";
final String[] selectionArgs = new String[] {
final String[] selectionArgs = new String[]{
split[1]
};

Expand Down Expand Up @@ -448,8 +483,7 @@ public static Bitmap getThumbnail(Context context, Uri uri, String mimeType) {
id,
MediaStore.Video.Thumbnails.MINI_KIND,
null);
}
else if (mimeType.contains(FileUtils.MIME_TYPE_IMAGE)) {
} else if (mimeType.contains(FileUtils.MIME_TYPE_IMAGE)) {
bm = MediaStore.Images.Thumbnails.getThumbnail(
resolver,
id,
Expand All @@ -468,48 +502,6 @@ else if (mimeType.contains(FileUtils.MIME_TYPE_IMAGE)) {
return bm;
}

/**
* File and folder comparator. TODO Expose sorting option method
*
* @author paulburke
*/
public static Comparator<File> sComparator = new Comparator<File>() {
@Override
public int compare(File f1, File f2) {
// Sort alphabetically by lower case, which is much cleaner
return f1.getName().toLowerCase().compareTo(
f2.getName().toLowerCase());
}
};

/**
* File (not directories) filter.
*
* @author paulburke
*/
public static FileFilter sFileFilter = new FileFilter() {
@Override
public boolean accept(File file) {
final String fileName = file.getName();
// Return files only (not directories) and skip hidden files
return file.isFile() && !fileName.startsWith(HIDDEN_PREFIX);
}
};

/**
* Folder (directories) filter.
*
* @author paulburke
*/
public static FileFilter sDirFilter = new FileFilter() {
@Override
public boolean accept(File file) {
final String fileName = file.getName();
// Return directories only and skip hidden directories
return file.isDirectory() && !fileName.startsWith(HIDDEN_PREFIX);
}
};

/**
* Get the Intent for selecting content to be used in an Intent Chooser.
*
Expand Down
3 changes: 1 addition & 2 deletions android/routerKeygen/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ def getNdkBuildCmd() {
dependencies {
compile project(':aFileChooser')
compile 'com.android.support:support-v4:22.1.1'
compile 'com.google.android.gms:play-services:+'
compile 'com.google.android.gms:play-services:7.3.0'
compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
compile 'com.android.support:support-v4:22.1.0'
compile 'ch.acra:acra:4.6.2'
compile files('libs/MMSDK.jar')
}
3 changes: 1 addition & 2 deletions android/routerKeygen/lint.xml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<lint>
</lint>
<lint></lint>
20 changes: 10 additions & 10 deletions android/routerKeygen/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.exobel.routerkeygen"
android:installLocation="auto"
android:versionCode="36"
android:versionName="3.14.1" >
android:versionCode="37"
android:versionName="3.14.2">

<uses-sdk
android:minSdkVersion="10"
Expand Down Expand Up @@ -36,16 +36,15 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.Sherlock" >
android:theme="@style/Theme.Sherlock">
<activity
android:name=".ui.Preferences"
android:configChanges="screenSize|orientation|keyboard"
android:label="@string/menu_preferences" >
</activity>
android:label="@string/menu_preferences"></activity>
<activity
android:name=".ui.NetworksListActivity"
android:configChanges="screenSize|keyboard|orientation"
android:label="@string/app_name" >
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -55,23 +54,24 @@
<activity
android:name=".ui.NetworkActivity"
android:configChanges="screenSize|keyboard|orientation"
android:label="@string/app_name" >
android:label="@string/app_name">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".NetworksListActivity" />
android:value=".ui.NetworksListActivity" />
</activity>
<activity
android:name=".ui.ManualInputActivity"
android:configChanges="screenSize|keyboard|orientation"
android:label="@string/menu_manual" >
android:label="@string/menu_manual">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".NetworksListActivity" />
android:value=".ui.NetworksListActivity" />
</activity>

<service android:name=".DictionaryDownloadService" />
<service android:name=".AutoConnectService" />
<service android:name=".UpdateCheckerService" />

<activity
android:name=".CancelOperationActivity"
android:excludeFromRecents="true"
Expand Down
41 changes: 23 additions & 18 deletions android/routerKeygen/src/main/java/com/farproc/wifi/connecter/ConfigurationSecurities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,35 @@
import android.net.wifi.WifiConfiguration;

public abstract class ConfigurationSecurities {
/**
public static ConfigurationSecurities newInstance() {
if (Version.SDK < 8) {
return new ConfigurationSecuritiesOld();
} else {
return new ConfigurationSecuritiesV8();
}
}

/**
* @return The security of a given {@link WifiConfiguration}.
*/
public abstract String getWifiConfigurationSecurity(WifiConfiguration wifiConfig);
/**
public abstract String getWifiConfigurationSecurity(WifiConfiguration wifiConfig);

/**
* @return The security of a given {@link ScanResult}.
*/
public abstract String getScanResultSecurity(ScanResult scanResult);
/**
public abstract String getScanResultSecurity(ScanResult scanResult);

/**
* Fill in the security fields of WifiConfiguration config.
* @param config The object to fill.
*
* @param config The object to fill.
* @param security If is OPEN, password is ignored.
* @param password Password of the network if security is not OPEN.
*/
public abstract void setupSecurity(WifiConfiguration config, String security, final String password);
public abstract String getDisplaySecirityString(final ScanResult scanResult);
public abstract boolean isOpenNetwork(final String security);

public static ConfigurationSecurities newInstance() {
if(Version.SDK < 8) {
return new ConfigurationSecuritiesOld();
} else {
return new ConfigurationSecuritiesV8();
}
}

public abstract void setupSecurity(WifiConfiguration config, String security, final String password);

public abstract String getDisplaySecirityString(final ScanResult scanResult);

public abstract boolean isOpenNetwork(final String security);

}
Loading

0 comments on commit 99b823b

Please sign in to comment.