25 | * String message to display in a Toast message. 26 | */ 27 | public static final String BUNDLE_EXTRA_STRING_MESSAGE = "com.yourcompany.yourapp.extra.STRING_MESSAGE"; //$NON-NLS-1$ 28 | /** 29 | * Type: {@code int} 30 | *
31 | * versionCode of the plug-in that saved the Bundle. 32 | */ 33 | /* 34 | * This extra is not strictly required, however it makes backward and forward compatibility significantly easier. For example, 35 | * suppose a bug is found in how some version of the plug-in stored its Bundle. By having the version, the plug-in can better 36 | * detect when such bugs occur. 37 | */ 38 | public static final String BUNDLE_EXTRA_INT_VERSION_CODE = "com.yourcompany.yourcondition.extra.INT_VERSION_CODE"; //$NON-NLS-1$ 39 | 40 | /** 41 | * Private constructor prevents instantiation 42 | * 43 | * @throws UnsupportedOperationException because this class cannot be instantiated. 44 | */ 45 | private PluginBundleManager() { 46 | throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$ 47 | } 48 | 49 | /** 50 | * Method to verify the content of the bundle are correct. 51 | *
52 | * This method will not mutate {@code bundle}. 53 | * 54 | * @param bundle bundle to verify. May be null, which will always return false. 55 | * @return true if the Bundle is valid, false if the bundle is invalid. 56 | */ 57 | public static boolean isBundleValid(final Bundle bundle) 58 | { 59 | if (null == bundle) 60 | { 61 | return false; 62 | } 63 | 64 | /* 65 | * Make sure the expected extras exist 66 | */ 67 | if (!bundle.containsKey(BUNDLE_EXTRA_STRING_MESSAGE)) 68 | { 69 | return false; 70 | } 71 | if (!bundle.containsKey(BUNDLE_EXTRA_INT_VERSION_CODE)) 72 | { 73 | return false; 74 | } 75 | 76 | /* 77 | * Make sure the correct number of extras exist. Run this test after checking for specific Bundle extras above so that the 78 | * error message is more useful. (E.g. the caller will see what extras are missing, rather than just a message that there 79 | * is the wrong number). 80 | */ 81 | if (2 != bundle.keySet().size()) 82 | { 83 | return false; 84 | } 85 | 86 | /* 87 | * Make sure the extra isn't null or empty 88 | */ 89 | if (TextUtils.isEmpty(bundle.getString(BUNDLE_EXTRA_STRING_MESSAGE))) 90 | { 91 | return false; 92 | } 93 | 94 | /* 95 | * Make sure the extra is the correct type 96 | */ 97 | if (bundle.getInt(BUNDLE_EXTRA_INT_VERSION_CODE, 0) != bundle.getInt(BUNDLE_EXTRA_INT_VERSION_CODE, 1)) 98 | { 99 | return false; 100 | } 101 | 102 | return true; 103 | } 104 | } -------------------------------------------------------------------------------- /MobileOrg/src/main/java/com/matburt/mobileorg/gui/outline/ConflictResolverActivity.java: -------------------------------------------------------------------------------- 1 | package com.matburt.mobileorg.gui.outline; 2 | 3 | import android.content.ContentValues; 4 | import android.content.Intent; 5 | import android.os.Bundle; 6 | import android.support.v4.app.NavUtils; 7 | import android.support.v7.app.ActionBar; 8 | import android.support.v7.app.AppCompatActivity; 9 | import android.support.v7.widget.Toolbar; 10 | import android.view.Menu; 11 | import android.view.MenuInflater; 12 | import android.view.MenuItem; 13 | import android.widget.EditText; 14 | 15 | import com.matburt.mobileorg.orgdata.OrgContract; 16 | import com.matburt.mobileorg.orgdata.OrgFile; 17 | import com.matburt.mobileorg.OrgNodeListActivity; 18 | import com.matburt.mobileorg.R; 19 | import com.matburt.mobileorg.synchronizers.JGitWrapper; 20 | import com.matburt.mobileorg.synchronizers.Synchronizer; 21 | import com.matburt.mobileorg.util.OrgFileNotFoundException; 22 | import com.matburt.mobileorg.util.OrgUtils; 23 | 24 | public class ConflictResolverActivity extends AppCompatActivity { 25 | 26 | EditText editText; 27 | String filename; 28 | Long nodeId; 29 | 30 | @Override 31 | protected void onCreate(Bundle savedInstanceState) { 32 | super.onCreate(savedInstanceState); 33 | setContentView(R.layout.activity_conflict_resolver); 34 | Toolbar toolbar = (Toolbar) findViewById(R.id.detail_toolbar); 35 | setSupportActionBar(toolbar); 36 | 37 | // Show the Up button in the action bar. 38 | ActionBar actionBar = getSupportActionBar(); 39 | 40 | 41 | 42 | if (savedInstanceState == null) { 43 | // Create the detail fragment and add it to the activity 44 | // using a fragment transaction. 45 | Bundle arguments = new Bundle(); 46 | nodeId = getIntent().getLongExtra(OrgContract.NODE_ID, -1); 47 | 48 | editText = (EditText)findViewById(R.id.conflict_resolver_text); 49 | try { 50 | OrgFile file = new OrgFile(nodeId, getContentResolver()); 51 | if (actionBar != null) { 52 | actionBar.setTitle(file.name); 53 | } 54 | 55 | String dir = Synchronizer.getInstance().getAbsoluteFilesDir(this); 56 | this.filename = dir+"/"+file.filename; 57 | editText.setText(OrgUtils.readAll(this.filename)); 58 | 59 | } catch (OrgFileNotFoundException e) { 60 | e.printStackTrace(); 61 | } 62 | } 63 | } 64 | 65 | @Override 66 | public boolean onCreateOptionsMenu(Menu menu) { 67 | MenuInflater inflater = getMenuInflater(); 68 | inflater.inflate(R.menu.edit_node_menu, menu); 69 | 70 | return true; 71 | } 72 | 73 | @Override 74 | public boolean onOptionsItemSelected(MenuItem item) { 75 | switch (item.getItemId()) { 76 | case R.id.edit_menu_cancel: 77 | NavUtils.navigateUpTo(this, new Intent(this, OrgNodeListActivity.class)); 78 | return true; 79 | case R.id.edit_menu_ok: 80 | if(this.filename!=null && !this.filename.equals("")){ 81 | OrgUtils.writeToFile(this.filename, editText.getText().toString()); 82 | new JGitWrapper.MergeTask(this, this.filename).execute(); 83 | OrgFile f = null; 84 | try { 85 | f = new OrgFile(nodeId, this.getContentResolver()); 86 | ContentValues values = new ContentValues(); 87 | values.put("comment", ""); 88 | f.updateFileInDB(this.getContentResolver(), values); 89 | } catch (OrgFileNotFoundException e) { 90 | e.printStackTrace(); 91 | } 92 | 93 | } 94 | NavUtils.navigateUpTo(this, new Intent(this, OrgNodeListActivity.class)); 95 | return true; 96 | } 97 | return false; 98 | } 99 | 100 | 101 | } 102 | -------------------------------------------------------------------------------- /MobileOrg/src/main/java/com/matburt/mobileorg/gui/SynchronizerNotificationCompat.java: -------------------------------------------------------------------------------- 1 | package com.matburt.mobileorg.gui; 2 | 3 | import android.app.Notification; 4 | import android.app.NotificationManager; 5 | import android.app.PendingIntent; 6 | import android.content.Context; 7 | import android.content.Intent; 8 | import android.support.v4.app.NotificationCompat; 9 | import android.support.v4.app.NotificationCompat.Builder; 10 | import android.widget.RemoteViews; 11 | 12 | import com.matburt.mobileorg.OrgNodeListActivity; 13 | import com.matburt.mobileorg.R; 14 | 15 | public class SynchronizerNotificationCompat { 16 | private NotificationManager notificationManager; 17 | private Notification notification; 18 | private int notifyRef = 1; 19 | private Context context; 20 | 21 | public SynchronizerNotificationCompat(Context context) { 22 | this.context = context; 23 | } 24 | 25 | public void errorNotification(String errorMsg) { 26 | this.notificationManager = (NotificationManager) context 27 | .getSystemService(Context.NOTIFICATION_SERVICE); 28 | Intent notifyIntent = new Intent(context, OrgNodeListActivity.class); 29 | notifyIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP 30 | | Intent.FLAG_ACTIVITY_SINGLE_TOP); 31 | 32 | PendingIntent contentIntent = PendingIntent.getActivity(context, 0, 33 | notifyIntent, 0); 34 | 35 | Builder builder = new NotificationCompat.Builder(context); 36 | builder.setContentIntent(contentIntent); 37 | builder.setSmallIcon(R.drawable.icon); 38 | builder.setContentTitle("Synchronization failed"); 39 | 40 | notification = builder.getNotification(); 41 | notification.contentView = notification.contentView = new RemoteViews( 42 | context.getPackageName(), R.layout.sync_notification); 43 | 44 | notification.contentView.setImageViewResource(R.id.status_icon, 45 | R.drawable.icon); 46 | notification.contentView.setTextViewText(R.id.status_text, errorMsg); 47 | notification.contentView.setProgressBar(R.id.status_progress, 100, 100, 48 | false); 49 | notificationManager.notify(notifyRef, notification); 50 | } 51 | 52 | public void setupNotification() { 53 | this.notificationManager = (NotificationManager) context 54 | .getSystemService(Context.NOTIFICATION_SERVICE); 55 | Intent notifyIntent = new Intent(context, OrgNodeListActivity.class); 56 | notifyIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP 57 | | Intent.FLAG_ACTIVITY_SINGLE_TOP); 58 | 59 | PendingIntent contentIntent = PendingIntent.getActivity(context, 0, 60 | notifyIntent, 0); 61 | 62 | Builder builder = new NotificationCompat.Builder(context); 63 | builder.setContentIntent(contentIntent); 64 | builder.setSmallIcon(R.drawable.icon); 65 | builder.setOngoing(true); 66 | builder.setContentTitle("Started synchronization"); 67 | builder.setContentText("Started synchronization"); 68 | notification = builder.getNotification(); 69 | 70 | notification.contentView = new RemoteViews(context.getPackageName(), 71 | R.layout.sync_notification); 72 | 73 | notification.contentView.setImageViewResource(R.id.status_icon, 74 | R.drawable.icon); 75 | notification.contentView.setTextViewText(R.id.status_text, 76 | context.getString(R.string.sync_synchronizing_changes)); 77 | notification.contentView.setProgressBar(R.id.status_progress, 100, 0, 78 | true); 79 | 80 | notificationManager.notify(notifyRef, notification); 81 | } 82 | 83 | public void updateNotification(String message) { 84 | if(notification == null) 85 | return; 86 | 87 | if(message != null) { 88 | notification.contentView.setTextViewText(R.id.status_text, message); 89 | notificationManager.notify(notifyRef, notification); 90 | } 91 | } 92 | 93 | public void updateNotification(int progress) { 94 | updateNotification(progress, null); 95 | } 96 | 97 | public void updateNotification(int progress, String message) { 98 | if(notification == null) 99 | return; 100 | 101 | if(message != null) 102 | notification.contentView.setTextViewText(R.id.status_text, message); 103 | 104 | notification.contentView.setProgressBar(R.id.status_progress, 100, 105 | progress, false); 106 | notificationManager.notify(notifyRef, notification); 107 | } 108 | 109 | public void finalizeNotification() { 110 | notificationManager.cancel(notifyRef); 111 | } 112 | 113 | } 114 | -------------------------------------------------------------------------------- /src-img/wizard_next_button.svg: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 117 | --------------------------------------------------------------------------------