Style all switches equally, without indentation
This commit is contained in:
parent
d6a8ef9e59
commit
e1a6e2386f
@ -232,91 +232,91 @@ public class FDroid extends ActionBarActivity {
|
|||||||
|
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
|
|
||||||
case R.id.action_update_repo:
|
case R.id.action_update_repo:
|
||||||
updateRepos();
|
updateRepos();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_manage_repos:
|
case R.id.action_manage_repos:
|
||||||
Intent i = new Intent(this, ManageReposActivity.class);
|
Intent i = new Intent(this, ManageReposActivity.class);
|
||||||
startActivityForResult(i, REQUEST_MANAGEREPOS);
|
startActivityForResult(i, REQUEST_MANAGEREPOS);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_settings:
|
case R.id.action_settings:
|
||||||
Intent prefs = new Intent(getBaseContext(), PreferencesActivity.class);
|
Intent prefs = new Intent(getBaseContext(), PreferencesActivity.class);
|
||||||
startActivityForResult(prefs, REQUEST_PREFS);
|
startActivityForResult(prefs, REQUEST_PREFS);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_swap:
|
case R.id.action_swap:
|
||||||
startActivity(new Intent(this, SwapActivity.class));
|
startActivity(new Intent(this, SwapActivity.class));
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_search:
|
case R.id.action_search:
|
||||||
onSearchRequested();
|
onSearchRequested();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_bluetooth_apk:
|
case R.id.action_bluetooth_apk:
|
||||||
/*
|
/*
|
||||||
* If Bluetooth has not been enabled/turned on, then enabling
|
* If Bluetooth has not been enabled/turned on, then enabling
|
||||||
* device discoverability will automatically enable Bluetooth
|
* device discoverability will automatically enable Bluetooth
|
||||||
*/
|
*/
|
||||||
Intent discoverBt = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
|
Intent discoverBt = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
|
||||||
discoverBt.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 121);
|
discoverBt.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 121);
|
||||||
startActivityForResult(discoverBt, REQUEST_ENABLE_BLUETOOTH);
|
startActivityForResult(discoverBt, REQUEST_ENABLE_BLUETOOTH);
|
||||||
// if this is successful, the Bluetooth transfer is started
|
// if this is successful, the Bluetooth transfer is started
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_about:
|
case R.id.action_about:
|
||||||
View view;
|
View view;
|
||||||
if (Build.VERSION.SDK_INT >= 11) {
|
if (Build.VERSION.SDK_INT >= 11) {
|
||||||
LayoutInflater li = LayoutInflater.from(this);
|
LayoutInflater li = LayoutInflater.from(this);
|
||||||
view = li.inflate(R.layout.about, null);
|
view = li.inflate(R.layout.about, null);
|
||||||
} else {
|
} else {
|
||||||
view = View.inflate(
|
view = View.inflate(
|
||||||
new ContextThemeWrapper(this, R.style.AboutDialogLight),
|
new ContextThemeWrapper(this, R.style.AboutDialogLight),
|
||||||
R.layout.about, null);
|
R.layout.about, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fill in the version...
|
// Fill in the version...
|
||||||
try {
|
try {
|
||||||
PackageInfo pi = getPackageManager()
|
PackageInfo pi = getPackageManager()
|
||||||
.getPackageInfo(getApplicationContext()
|
.getPackageInfo(getApplicationContext()
|
||||||
.getPackageName(), 0);
|
.getPackageName(), 0);
|
||||||
((TextView) view.findViewById(R.id.version))
|
((TextView) view.findViewById(R.id.version))
|
||||||
.setText(pi.versionName);
|
.setText(pi.versionName);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Builder p;
|
Builder p;
|
||||||
if (Build.VERSION.SDK_INT >= 11) {
|
if (Build.VERSION.SDK_INT >= 11) {
|
||||||
p = new AlertDialog.Builder(this).setView(view);
|
p = new AlertDialog.Builder(this).setView(view);
|
||||||
} else {
|
} else {
|
||||||
p = new AlertDialog.Builder(
|
p = new AlertDialog.Builder(
|
||||||
new ContextThemeWrapper(
|
new ContextThemeWrapper(
|
||||||
this, R.style.AboutDialogLight)
|
this, R.style.AboutDialogLight)
|
||||||
).setView(view);
|
).setView(view);
|
||||||
}
|
}
|
||||||
final AlertDialog alrt = p.create();
|
final AlertDialog alrt = p.create();
|
||||||
alrt.setIcon(R.drawable.ic_launcher);
|
alrt.setIcon(R.drawable.ic_launcher);
|
||||||
alrt.setTitle(getString(R.string.about_title));
|
alrt.setTitle(getString(R.string.about_title));
|
||||||
alrt.setButton(AlertDialog.BUTTON_NEUTRAL,
|
alrt.setButton(AlertDialog.BUTTON_NEUTRAL,
|
||||||
getString(R.string.about_website),
|
getString(R.string.about_website),
|
||||||
new DialogInterface.OnClickListener() {
|
new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog,
|
public void onClick(DialogInterface dialog,
|
||||||
int whichButton) {
|
int whichButton) {
|
||||||
Uri uri = Uri.parse("https://f-droid.org");
|
Uri uri = Uri.parse("https://f-droid.org");
|
||||||
startActivity(new Intent(Intent.ACTION_VIEW, uri));
|
startActivity(new Intent(Intent.ACTION_VIEW, uri));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
alrt.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.ok),
|
alrt.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.ok),
|
||||||
new DialogInterface.OnClickListener() {
|
new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog,
|
public void onClick(DialogInterface dialog,
|
||||||
int whichButton) {
|
int whichButton) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
alrt.show();
|
alrt.show();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
@ -101,15 +101,15 @@ public class FDroidApp extends Application {
|
|||||||
|
|
||||||
public void applyTheme(Activity activity) {
|
public void applyTheme(Activity activity) {
|
||||||
switch (curTheme) {
|
switch (curTheme) {
|
||||||
case dark:
|
case dark:
|
||||||
activity.setTheme(R.style.AppThemeDark);
|
activity.setTheme(R.style.AppThemeDark);
|
||||||
break;
|
break;
|
||||||
case light:
|
case light:
|
||||||
activity.setTheme(R.style.AppThemeLight);
|
activity.setTheme(R.style.AppThemeLight);
|
||||||
break;
|
break;
|
||||||
case lightWithDarkActionBar:
|
case lightWithDarkActionBar:
|
||||||
activity.setTheme(R.style.AppThemeLightWithDarkActionBar);
|
activity.setTheme(R.style.AppThemeLightWithDarkActionBar);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,9 +64,9 @@ public class PreferencesActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case android.R.id.home:
|
case android.R.id.home:
|
||||||
NavUtils.navigateUpFromSameTask(this);
|
NavUtils.navigateUpFromSameTask(this);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
@ -354,28 +354,28 @@ public class ApkProvider extends FDroidProvider {
|
|||||||
QuerySelection query = new QuerySelection(selection, selectionArgs);
|
QuerySelection query = new QuerySelection(selection, selectionArgs);
|
||||||
|
|
||||||
switch (matcher.match(uri)) {
|
switch (matcher.match(uri)) {
|
||||||
case CODE_LIST:
|
case CODE_LIST:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_SINGLE:
|
case CODE_SINGLE:
|
||||||
query = query.add(querySingle(uri));
|
query = query.add(querySingle(uri));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_APP:
|
case CODE_APP:
|
||||||
query = query.add(queryApp(uri.getLastPathSegment()));
|
query = query.add(queryApp(uri.getLastPathSegment()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_APKS:
|
case CODE_APKS:
|
||||||
query = query.add(queryApks(uri.getLastPathSegment()));
|
query = query.add(queryApks(uri.getLastPathSegment()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_REPO:
|
case CODE_REPO:
|
||||||
query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
|
query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Log.e(TAG, "Invalid URI for apk content provider: " + uri);
|
Log.e(TAG, "Invalid URI for apk content provider: " + uri);
|
||||||
throw new UnsupportedOperationException("Invalid URI for apk content provider: " + uri);
|
throw new UnsupportedOperationException("Invalid URI for apk content provider: " + uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
Query queryBuilder = new Query();
|
Query queryBuilder = new Query();
|
||||||
@ -423,27 +423,27 @@ public class ApkProvider extends FDroidProvider {
|
|||||||
|
|
||||||
switch (matcher.match(uri)) {
|
switch (matcher.match(uri)) {
|
||||||
|
|
||||||
case CODE_REPO:
|
case CODE_REPO:
|
||||||
query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
|
query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_APP:
|
case CODE_APP:
|
||||||
query = query.add(queryApp(uri.getLastPathSegment()));
|
query = query.add(queryApp(uri.getLastPathSegment()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_APKS:
|
case CODE_APKS:
|
||||||
query = query.add(queryApks(uri.getLastPathSegment()));
|
query = query.add(queryApks(uri.getLastPathSegment()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_LIST:
|
case CODE_LIST:
|
||||||
throw new UnsupportedOperationException("Can't delete all apks.");
|
throw new UnsupportedOperationException("Can't delete all apks.");
|
||||||
|
|
||||||
case CODE_SINGLE:
|
case CODE_SINGLE:
|
||||||
throw new UnsupportedOperationException("Can't delete individual apks.");
|
throw new UnsupportedOperationException("Can't delete individual apks.");
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Log.e(TAG, "Invalid URI for apk content provider: " + uri);
|
Log.e(TAG, "Invalid URI for apk content provider: " + uri);
|
||||||
throw new UnsupportedOperationException("Invalid URI for apk content provider: " + uri);
|
throw new UnsupportedOperationException("Invalid URI for apk content provider: " + uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
int rowsAffected = write().delete(getTableName(), query.getSelection(), query.getArgs());
|
int rowsAffected = write().delete(getTableName(), query.getSelection(), query.getArgs());
|
||||||
|
@ -87,16 +87,14 @@ public abstract class FDroidProvider extends ContentProvider {
|
|||||||
@Override
|
@Override
|
||||||
public String getType(Uri uri) {
|
public String getType(Uri uri) {
|
||||||
String type;
|
String type;
|
||||||
switch(getMatcher().match(uri)) {
|
switch (getMatcher().match(uri)) {
|
||||||
case CODE_LIST:
|
case CODE_LIST:
|
||||||
type = "dir";
|
type = "dir";
|
||||||
break;
|
break;
|
||||||
|
case CODE_SINGLE:
|
||||||
case CODE_SINGLE:
|
default:
|
||||||
default:
|
type = "item";
|
||||||
type = "item";
|
break;
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
return "vnd.android.cursor." + type + "/vnd." + AUTHORITY + "." + getProviderName();
|
return "vnd.android.cursor." + type + "/vnd." + AUTHORITY + "." + getProviderName();
|
||||||
}
|
}
|
||||||
|
@ -143,21 +143,21 @@ public class InstalledAppProvider extends FDroidProvider {
|
|||||||
|
|
||||||
QuerySelection selection = new QuerySelection(customSelection, selectionArgs);
|
QuerySelection selection = new QuerySelection(customSelection, selectionArgs);
|
||||||
switch (matcher.match(uri)) {
|
switch (matcher.match(uri)) {
|
||||||
case CODE_LIST:
|
case CODE_LIST:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_SINGLE:
|
case CODE_SINGLE:
|
||||||
selection = selection.add(queryApp(uri.getLastPathSegment()));
|
selection = selection.add(queryApp(uri.getLastPathSegment()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_SEARCH:
|
case CODE_SEARCH:
|
||||||
selection = selection.add(querySearch(uri.getLastPathSegment()));
|
selection = selection.add(querySearch(uri.getLastPathSegment()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
String message = "Invalid URI for installed app content provider: " + uri;
|
String message = "Invalid URI for installed app content provider: " + uri;
|
||||||
Log.e(TAG, message);
|
Log.e(TAG, message);
|
||||||
throw new UnsupportedOperationException(message);
|
throw new UnsupportedOperationException(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
Cursor cursor = read().query(getTableName(), projection, selection.getSelection(), selection.getArgs(), null, null, sortOrder);
|
Cursor cursor = read().query(getTableName(), projection, selection.getSelection(), selection.getArgs(), null, null, sortOrder);
|
||||||
|
@ -281,22 +281,22 @@ public class RepoProvider extends FDroidProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (matcher.match(uri)) {
|
switch (matcher.match(uri)) {
|
||||||
case CODE_LIST:
|
case CODE_LIST:
|
||||||
// Do nothing (don't restrict query)
|
// Do nothing (don't restrict query)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_SINGLE:
|
case CODE_SINGLE:
|
||||||
selection = ( selection == null ? "" : selection + " AND " ) +
|
selection = ( selection == null ? "" : selection + " AND " ) +
|
||||||
DataColumns._ID + " = " + uri.getLastPathSegment();
|
DataColumns._ID + " = " + uri.getLastPathSegment();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CODE_ALL_EXCEPT_SWAP:
|
case CODE_ALL_EXCEPT_SWAP:
|
||||||
selection = DataColumns.IS_SWAP + " = 0 OR " + DataColumns.IS_SWAP + " IS NULL ";
|
selection = DataColumns.IS_SWAP + " = 0 OR " + DataColumns.IS_SWAP + " IS NULL ";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Log.e(TAG, "Invalid URI for repo content provider: " + uri);
|
Log.e(TAG, "Invalid URI for repo content provider: " + uri);
|
||||||
throw new UnsupportedOperationException("Invalid URI for repo content provider: " + uri);
|
throw new UnsupportedOperationException("Invalid URI for repo content provider: " + uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
Cursor cursor = read().query(getTableName(), projection, selection,
|
Cursor cursor = read().query(getTableName(), projection, selection,
|
||||||
@ -346,18 +346,18 @@ public class RepoProvider extends FDroidProvider {
|
|||||||
public int delete(Uri uri, String where, String[] whereArgs) {
|
public int delete(Uri uri, String where, String[] whereArgs) {
|
||||||
|
|
||||||
switch (matcher.match(uri)) {
|
switch (matcher.match(uri)) {
|
||||||
case CODE_LIST:
|
case CODE_LIST:
|
||||||
// Don't support deleting of multiple repos.
|
// Don't support deleting of multiple repos.
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case CODE_SINGLE:
|
case CODE_SINGLE:
|
||||||
where = ( where == null ? "" : where + " AND " ) +
|
where = ( where == null ? "" : where + " AND " ) +
|
||||||
"_ID = " + uri.getLastPathSegment();
|
"_ID = " + uri.getLastPathSegment();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Log.e(TAG, "Invalid URI for repo content provider: " + uri);
|
Log.e(TAG, "Invalid URI for repo content provider: " + uri);
|
||||||
throw new UnsupportedOperationException("Invalid URI for repo content provider: " + uri);
|
throw new UnsupportedOperationException("Invalid URI for repo content provider: " + uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
int rowsAffected = write().delete(getTableName(), where, whereArgs);
|
int rowsAffected = write().delete(getTableName(), where, whereArgs);
|
||||||
|
@ -91,16 +91,16 @@ public class DefaultInstaller extends Installer {
|
|||||||
* never executed on Androids before 4.0
|
* never executed on Androids before 4.0
|
||||||
*/
|
*/
|
||||||
switch (requestCode) {
|
switch (requestCode) {
|
||||||
case REQUEST_CODE_INSTALL:
|
case REQUEST_CODE_INSTALL:
|
||||||
mCallback.onSuccess(InstallerCallback.OPERATION_INSTALL);
|
mCallback.onSuccess(InstallerCallback.OPERATION_INSTALL);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
case REQUEST_CODE_DELETE:
|
case REQUEST_CODE_DELETE:
|
||||||
mCallback.onSuccess(InstallerCallback.OPERATION_DELETE);
|
mCallback.onSuccess(InstallerCallback.OPERATION_DELETE);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,34 +99,34 @@ public class DefaultInstallerSdk14 extends Installer {
|
|||||||
@Override
|
@Override
|
||||||
public boolean handleOnActivityResult(int requestCode, int resultCode, Intent data) {
|
public boolean handleOnActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
switch (requestCode) {
|
switch (requestCode) {
|
||||||
case REQUEST_CODE_INSTALL:
|
case REQUEST_CODE_INSTALL:
|
||||||
if (resultCode == Activity.RESULT_OK) {
|
if (resultCode == Activity.RESULT_OK) {
|
||||||
mCallback.onSuccess(InstallerCallback.OPERATION_INSTALL);
|
mCallback.onSuccess(InstallerCallback.OPERATION_INSTALL);
|
||||||
} else if (resultCode == Activity.RESULT_CANCELED) {
|
} else if (resultCode == Activity.RESULT_CANCELED) {
|
||||||
mCallback.onError(InstallerCallback.OPERATION_INSTALL,
|
mCallback.onError(InstallerCallback.OPERATION_INSTALL,
|
||||||
InstallerCallback.ERROR_CODE_CANCELED);
|
InstallerCallback.ERROR_CODE_CANCELED);
|
||||||
} else {
|
} else {
|
||||||
mCallback.onError(InstallerCallback.OPERATION_INSTALL,
|
mCallback.onError(InstallerCallback.OPERATION_INSTALL,
|
||||||
InstallerCallback.ERROR_CODE_OTHER);
|
InstallerCallback.ERROR_CODE_OTHER);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
case REQUEST_CODE_DELETE:
|
case REQUEST_CODE_DELETE:
|
||||||
if (resultCode == Activity.RESULT_OK) {
|
if (resultCode == Activity.RESULT_OK) {
|
||||||
mCallback.onSuccess(InstallerCallback.OPERATION_DELETE);
|
mCallback.onSuccess(InstallerCallback.OPERATION_DELETE);
|
||||||
} else if (resultCode == Activity.RESULT_CANCELED) {
|
} else if (resultCode == Activity.RESULT_CANCELED) {
|
||||||
mCallback.onError(InstallerCallback.OPERATION_DELETE,
|
mCallback.onError(InstallerCallback.OPERATION_DELETE,
|
||||||
InstallerCallback.ERROR_CODE_CANCELED);
|
InstallerCallback.ERROR_CODE_CANCELED);
|
||||||
} else {
|
} else {
|
||||||
// UninstallAppProgress actually returns
|
// UninstallAppProgress actually returns
|
||||||
// Activity.RESULT_FIRST_USER if something breaks
|
// Activity.RESULT_FIRST_USER if something breaks
|
||||||
mCallback.onError(InstallerCallback.OPERATION_DELETE,
|
mCallback.onError(InstallerCallback.OPERATION_DELETE,
|
||||||
InstallerCallback.ERROR_CODE_OTHER);
|
InstallerCallback.ERROR_CODE_OTHER);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,12 +20,12 @@ public class IconDownloader extends BaseImageDownloader {
|
|||||||
@Override
|
@Override
|
||||||
public InputStream getStream(String imageUri, Object extra) throws IOException {
|
public InputStream getStream(String imageUri, Object extra) throws IOException {
|
||||||
switch (Scheme.ofUri(imageUri)) {
|
switch (Scheme.ofUri(imageUri)) {
|
||||||
case HTTP:
|
case HTTP:
|
||||||
case HTTPS:
|
case HTTPS:
|
||||||
Downloader downloader = DownloaderFactory.create(imageUri, context);
|
Downloader downloader = DownloaderFactory.create(imageUri, context);
|
||||||
return downloader.getInputStream();
|
return downloader.getInputStream();
|
||||||
default:
|
default:
|
||||||
return super.getStream(imageUri, extra);
|
return super.getStream(imageUri, extra);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,7 @@ public class LocalHTTPD extends NanoHTTPD {
|
|||||||
|
|
||||||
private Response handlePost(IHTTPSession session) {
|
private Response handlePost(IHTTPSession session) {
|
||||||
Uri uri = Uri.parse(session.getUri());
|
Uri uri = Uri.parse(session.getUri());
|
||||||
switch(uri.getPath()) {
|
switch (uri.getPath()) {
|
||||||
case "/request-swap":
|
case "/request-swap":
|
||||||
if (!session.getParms().containsKey("repo")) {
|
if (!session.getParms().containsKey("repo")) {
|
||||||
Log.e(TAG, "Malformed /request-swap request to local repo HTTP server. Should have posted a 'repo' parameter." );
|
Log.e(TAG, "Malformed /request-swap request to local repo HTTP server. Should have posted a 'repo' parameter." );
|
||||||
|
@ -32,31 +32,30 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Fragment getItem(int i) {
|
public Fragment getItem(int i) {
|
||||||
if (i == 0) {
|
switch (i) {
|
||||||
|
case 0:
|
||||||
return new AvailableAppsFragment();
|
return new AvailableAppsFragment();
|
||||||
}
|
case 1:
|
||||||
if (i == 1) {
|
|
||||||
return new InstalledAppsFragment();
|
return new InstalledAppsFragment();
|
||||||
|
default:
|
||||||
|
return new CanUpdateAppsFragment();
|
||||||
}
|
}
|
||||||
return new CanUpdateAppsFragment();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getCount() {
|
public int getCount() { return 3; }
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPageTitle(int i) {
|
public String getPageTitle(int i) {
|
||||||
switch(i) {
|
switch (i) {
|
||||||
case 0:
|
case 0:
|
||||||
return parent.getString(R.string.tab_noninstalled);
|
return parent.getString(R.string.tab_noninstalled);
|
||||||
case 1:
|
case 1:
|
||||||
return parent.getString(R.string.inst);
|
return parent.getString(R.string.inst);
|
||||||
case 2:
|
case 2:
|
||||||
return getUpdateTabTitle();
|
return getUpdateTabTitle();
|
||||||
default:
|
default:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -161,15 +161,15 @@ public class LocalRepoActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case R.id.menu_setup_repo:
|
case R.id.menu_setup_repo:
|
||||||
startActivityForResult(new Intent(this, SelectLocalAppsActivity.class), UPDATE_REPO);
|
startActivityForResult(new Intent(this, SelectLocalAppsActivity.class), UPDATE_REPO);
|
||||||
return true;
|
return true;
|
||||||
case R.id.menu_send_fdroid_via_wifi:
|
case R.id.menu_send_fdroid_via_wifi:
|
||||||
startActivity(new Intent(this, QrWizardWifiNetworkActivity.class));
|
startActivity(new Intent(this, QrWizardWifiNetworkActivity.class));
|
||||||
return true;
|
return true;
|
||||||
case R.id.menu_settings:
|
case R.id.menu_settings:
|
||||||
startActivityForResult(new Intent(this, PreferencesActivity.class), SET_IP_ADDRESS);
|
startActivityForResult(new Intent(this, PreferencesActivity.class), SET_IP_ADDRESS);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -190,17 +190,17 @@ public class LocalRepoActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
protected Dialog onCreateDialog(int id) {
|
protected Dialog onCreateDialog(int id) {
|
||||||
switch (id) {
|
switch (id) {
|
||||||
case 0:
|
case 0:
|
||||||
repoProgress = new ProgressDialog(this);
|
repoProgress = new ProgressDialog(this);
|
||||||
repoProgress.setMessage("Scanning Apps. Please wait...");
|
repoProgress.setMessage("Scanning Apps. Please wait...");
|
||||||
repoProgress.setIndeterminate(false);
|
repoProgress.setIndeterminate(false);
|
||||||
repoProgress.setMax(100);
|
repoProgress.setMax(100);
|
||||||
repoProgress.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
|
repoProgress.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
|
||||||
repoProgress.setCancelable(false);
|
repoProgress.setCancelable(false);
|
||||||
repoProgress.show();
|
repoProgress.show();
|
||||||
return repoProgress;
|
return repoProgress;
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,9 +115,9 @@ public class RepoDetailsActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case android.R.id.home:
|
case android.R.id.home:
|
||||||
NavUtils.navigateUpFromSameTask(this);
|
NavUtils.navigateUpFromSameTask(this);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
@ -47,13 +47,13 @@ public class SelectLocalAppsActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case android.R.id.home:
|
case android.R.id.home:
|
||||||
setResult(RESULT_CANCELED);
|
setResult(RESULT_CANCELED);
|
||||||
finish();
|
finish();
|
||||||
return true;
|
return true;
|
||||||
case R.id.action_settings:
|
case R.id.action_settings:
|
||||||
startActivity(new Intent(this, PreferencesActivity.class));
|
startActivity(new Intent(this, PreferencesActivity.class));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
@ -75,12 +75,12 @@ public class SelectLocalAppsActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onActionItemClicked(final ActionMode mode, MenuItem item) {
|
public boolean onActionItemClicked(final ActionMode mode, MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case R.id.action_update_repo:
|
case R.id.action_update_repo:
|
||||||
setResult(RESULT_OK);
|
setResult(RESULT_OK);
|
||||||
finish();
|
finish();
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user